sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:3.1: mi_xmlrpc: update cfg framework structures in extra MI processes

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: f1bd0d840ec4a8521d8ad97bc8fe424913b71a7e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1bd0d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 19:29:36 2011 +0200 mi_xmlrpc: update cfg framework structures in extra MI processes (cherry picked from commit b1429aef87e64833e0fa3c8f3356ce2ac69a4dee) --- modules_k/mi_xmlrpc/mi_xmlrpc.c | 9 +++++++++ modules_k/mi_xmlrpc/xr_server.c | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/mi_xmlrpc/mi_xmlrpc.c b/modules_k/mi_xmlrpc/mi_xmlrpc.c index 6d9bf51..9be1650 100644 --- a/modules_k/mi_xmlrpc/mi_xmlrpc.c +++ b/modules_k/mi_xmlrpc/mi_xmlrpc.c @@ -65,6 +65,7 @@ #include "../../pt.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../cfg/cfg_struct.h" xmlrpc_env env; xmlrpc_value * xr_response; @@ -134,6 +135,9 @@ static int mod_init(void) /* add space for extra processes */ register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); + return 0; } @@ -146,6 +150,11 @@ static int child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + xmlrpc_process(1); } } diff --git a/modules_k/mi_xmlrpc/xr_server.c b/modules_k/mi_xmlrpc/xr_server.c index 18d5e0f..8d3f8bc 100644 --- a/modules_k/mi_xmlrpc/xr_server.c +++ b/modules_k/mi_xmlrpc/xr_server.c @@ -35,6 +35,7 @@ #include "../../mem/shm_mem.h" #include "../../locking.h" #include "../../ut.h" +#include "../../cfg/cfg_struct.h" #include "xr_writer.h" #include "xr_parser.h" #include "mi_xmlrpc.h" @@ -177,6 +178,9 @@ xmlrpc_value* default_method (xmlrpc_env* env, LM_DBG("starting up.....\n"); + /* update the local config framework structures */ + cfg_update(); + f = lookup_mi_cmd((char*)methodName, strlen(methodName)); if ( f == 0 ) {

13 years, 7 months

git:3.1: mi_datagram: update cfg framework structures in extra MI processes

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: eb6f5f221a6134e9d8e81e6eaeffd33e76d551a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb6f5f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 19:17:57 2011 +0200 mi_datagram: update cfg framework structures in extra MI processes (cherry picked from commit 0baefce396796b02c77c9d9e2b02a63682d02173) --- modules_k/mi_datagram/datagram_fnc.c | 4 ++++ modules_k/mi_datagram/mi_datagram.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules_k/mi_datagram/datagram_fnc.c b/modules_k/mi_datagram/datagram_fnc.c index e26a55a..6c4dc29 100644 --- a/modules_k/mi_datagram/datagram_fnc.c +++ b/modules_k/mi_datagram/datagram_fnc.c @@ -48,6 +48,7 @@ #include <signal.h> #include "../../resolve.h" +#include "../../cfg/cfg_struct.h" #include "mi_datagram.h" #include "datagram_fnc.h" #include "mi_datagram_parser.h" @@ -434,6 +435,9 @@ void mi_datagram_server(int rx_sock, int tx_sock) f = 0; while(1) { /*read the datagram*/ + /* update the local config framework structures */ + cfg_update(); + memset(mi_buf, 0, DATAGRAM_SOCK_BUF_SIZE); reply_addr_len = sizeof(reply_addr); diff --git a/modules_k/mi_datagram/mi_datagram.c b/modules_k/mi_datagram/mi_datagram.c index e45cee2..0e2f303 100644 --- a/modules_k/mi_datagram/mi_datagram.c +++ b/modules_k/mi_datagram/mi_datagram.c @@ -56,6 +56,7 @@ #include "../../lib/kmi/mi.h" #include "../../ip_addr.h" #include "../../pt.h" +#include "../../cfg/cfg_struct.h" #include "mi_datagram.h" #include "datagram_fnc.h" #include "mi_datagram_parser.h" @@ -253,6 +254,8 @@ static int mi_mod_init(void) done: /* add space for extra processes */ register_procs(mi_procs[0].no); + /* add child to update local config framework structures */ + cfg_register_child(mi_procs[0].no); return 0; } @@ -282,6 +285,11 @@ static int mi_child_init(int rank) return -1; /* error */ if(pid==0) { /* child */ + + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + datagram_process(i); return 0; }

13 years, 7 months

git:master: mi_xmlrpc: update cfg framework structures in extra MI processes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b1429aef87e64833e0fa3c8f3356ce2ac69a4dee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1429ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 19:29:36 2011 +0200 mi_xmlrpc: update cfg framework structures in extra MI processes --- modules_k/mi_xmlrpc/mi_xmlrpc.c | 9 +++++++++ modules_k/mi_xmlrpc/xr_server.c | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/mi_xmlrpc/mi_xmlrpc.c b/modules_k/mi_xmlrpc/mi_xmlrpc.c index 6d9bf51..9be1650 100644 --- a/modules_k/mi_xmlrpc/mi_xmlrpc.c +++ b/modules_k/mi_xmlrpc/mi_xmlrpc.c @@ -65,6 +65,7 @@ #include "../../pt.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../cfg/cfg_struct.h" xmlrpc_env env; xmlrpc_value * xr_response; @@ -134,6 +135,9 @@ static int mod_init(void) /* add space for extra processes */ register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); + return 0; } @@ -146,6 +150,11 @@ static int child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + xmlrpc_process(1); } } diff --git a/modules_k/mi_xmlrpc/xr_server.c b/modules_k/mi_xmlrpc/xr_server.c index 18d5e0f..8d3f8bc 100644 --- a/modules_k/mi_xmlrpc/xr_server.c +++ b/modules_k/mi_xmlrpc/xr_server.c @@ -35,6 +35,7 @@ #include "../../mem/shm_mem.h" #include "../../locking.h" #include "../../ut.h" +#include "../../cfg/cfg_struct.h" #include "xr_writer.h" #include "xr_parser.h" #include "mi_xmlrpc.h" @@ -177,6 +178,9 @@ xmlrpc_value* default_method (xmlrpc_env* env, LM_DBG("starting up.....\n"); + /* update the local config framework structures */ + cfg_update(); + f = lookup_mi_cmd((char*)methodName, strlen(methodName)); if ( f == 0 ) {

13 years, 7 months

git:master: mi_datagram: update cfg framework structures in extra MI processes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0baefce396796b02c77c9d9e2b02a63682d02173 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0baefce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 19:17:57 2011 +0200 mi_datagram: update cfg framework structures in extra MI processes --- modules_k/mi_datagram/datagram_fnc.c | 4 ++++ modules_k/mi_datagram/mi_datagram.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules_k/mi_datagram/datagram_fnc.c b/modules_k/mi_datagram/datagram_fnc.c index 72cdff9..e93949a 100644 --- a/modules_k/mi_datagram/datagram_fnc.c +++ b/modules_k/mi_datagram/datagram_fnc.c @@ -48,6 +48,7 @@ #include <signal.h> #include "../../resolve.h" +#include "../../cfg/cfg_struct.h" #include "mi_datagram.h" #include "datagram_fnc.h" #include "mi_datagram_parser.h" @@ -435,6 +436,9 @@ void mi_datagram_server(int rx_sock, int tx_sock) f = 0; while(1) { /*read the datagram*/ + /* update the local config framework structures */ + cfg_update(); + memset(mi_buf, 0, DATAGRAM_SOCK_BUF_SIZE); reply_addr_len = sizeof(reply_addr); diff --git a/modules_k/mi_datagram/mi_datagram.c b/modules_k/mi_datagram/mi_datagram.c index e45cee2..0e2f303 100644 --- a/modules_k/mi_datagram/mi_datagram.c +++ b/modules_k/mi_datagram/mi_datagram.c @@ -56,6 +56,7 @@ #include "../../lib/kmi/mi.h" #include "../../ip_addr.h" #include "../../pt.h" +#include "../../cfg/cfg_struct.h" #include "mi_datagram.h" #include "datagram_fnc.h" #include "mi_datagram_parser.h" @@ -253,6 +254,8 @@ static int mi_mod_init(void) done: /* add space for extra processes */ register_procs(mi_procs[0].no); + /* add child to update local config framework structures */ + cfg_register_child(mi_procs[0].no); return 0; } @@ -282,6 +285,11 @@ static int mi_child_init(int rank) return -1; /* error */ if(pid==0) { /* child */ + + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + datagram_process(i); return 0; }

13 years, 7 months

git:3.1: mi_fifo: update the config framework structures in fifo process

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 6452fc57d09792245dfc12f84c8c294bb7789b23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6452fc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 19:02:15 2011 +0200 mi_fifo: update the config framework structures in fifo process - the extra process created by mi_fifo to listen on fifo file was not registered for updating the config framework structures - reported by Klaus Darilion - credits to Miklos Tirpak for hints to do it (cherry picked from commit b5754d49ce59d659f641e5892f763208401ce8d2) --- modules_k/mi_fifo/fifo_fnc.c | 4 ++++ modules_k/mi_fifo/mi_fifo.c | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/mi_fifo/fifo_fnc.c b/modules_k/mi_fifo/fifo_fnc.c index 6284590..5f0d07d 100644 --- a/modules_k/mi_fifo/fifo_fnc.c +++ b/modules_k/mi_fifo/fifo_fnc.c @@ -47,6 +47,7 @@ #include "../../lib/kmi/mi.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../cfg/cfg_struct.h" #include "mi_fifo.h" #include "fifo_fnc.h" #include "mi_parser.h" @@ -409,6 +410,9 @@ void mi_fifo_server(FILE *fifo_stream) FILE *reply_stream; while(1) { + /* update the local config framework structures */ + cfg_update(); + reply_stream = NULL; /* commands must look this way ':<command>:[filename]' */ diff --git a/modules_k/mi_fifo/mi_fifo.c b/modules_k/mi_fifo/mi_fifo.c index 17a72b8..9530c4c 100644 --- a/modules_k/mi_fifo/mi_fifo.c +++ b/modules_k/mi_fifo/mi_fifo.c @@ -46,6 +46,7 @@ #include "../../pt.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../cfg/cfg_struct.h" #include "../../lib/kmi/mi.h" #include "mi_fifo.h" #include "mi_parser.h" @@ -174,6 +175,9 @@ static int mi_mod_init(void) /* add space for one extra process */ register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); + return 0; } @@ -196,6 +200,11 @@ static int mi_child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + fifo_process(1); } }

13 years, 7 months

git:master: mi_fifo: update the config framework structures in fifo process

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b5754d49ce59d659f641e5892f763208401ce8d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5754d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 19:02:15 2011 +0200 mi_fifo: update the config framework structures in fifo process - the extra process created by mi_fifo to listen on fifo file was not registered for updating the config framework structures - reported by Klaus Darilion - credits to Miklos Tirpak for hints to do it --- modules_k/mi_fifo/fifo_fnc.c | 4 ++++ modules_k/mi_fifo/mi_fifo.c | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/mi_fifo/fifo_fnc.c b/modules_k/mi_fifo/fifo_fnc.c index 6284590..5f0d07d 100644 --- a/modules_k/mi_fifo/fifo_fnc.c +++ b/modules_k/mi_fifo/fifo_fnc.c @@ -47,6 +47,7 @@ #include "../../lib/kmi/mi.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../cfg/cfg_struct.h" #include "mi_fifo.h" #include "fifo_fnc.h" #include "mi_parser.h" @@ -409,6 +410,9 @@ void mi_fifo_server(FILE *fifo_stream) FILE *reply_stream; while(1) { + /* update the local config framework structures */ + cfg_update(); + reply_stream = NULL; /* commands must look this way ':<command>:[filename]' */ diff --git a/modules_k/mi_fifo/mi_fifo.c b/modules_k/mi_fifo/mi_fifo.c index 17a72b8..9530c4c 100644 --- a/modules_k/mi_fifo/mi_fifo.c +++ b/modules_k/mi_fifo/mi_fifo.c @@ -46,6 +46,7 @@ #include "../../pt.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../cfg/cfg_struct.h" #include "../../lib/kmi/mi.h" #include "mi_fifo.h" #include "mi_parser.h" @@ -174,6 +175,9 @@ static int mi_mod_init(void) /* add space for one extra process */ register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); + return 0; } @@ -196,6 +200,11 @@ static int mi_child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + fifo_process(1); } }

13 years, 7 months

Possible bug in RLS module

by Peter Dunkley

Hello, I think I may have found a bug in the RLS module. Take two subscribers (alice and bob) who have each other in their contact lists. Log them in (so REGISTER, SUBSCRIBE(presence.winfo), SUBSCRIBE(presence), PUBLISH, and so on). Log one (bob) out. bob's status remains online in alice's client. Restart alice's client (logging her out and in again). bob's status is still shown as online. Has anyone encountered this before? I think it might be related to some errors I am seeing. When my client unSUBSCRIBEs on sign-out I get the following errors (the line numbers may be slightly out from the base 3.1.2 version as I added some diagnostics to try and find the problem): Mar 29 13:57:51 supernode /usr/sbin/kamailio[20259]: ERROR: rls [notify.c:280]: updating in hash table Mar 29 13:57:51 supernode /usr/sbin/kamailio[20259]: ERROR: rls [notify.c:150]: in function agg_body_sendn_update Mar 29 13:57:51 supernode /usr/sbin/kamailio[20259]: ERROR: rls [subscribe.c:638]: failed sending full state notify Mar 29 13:57:51 supernode /usr/sbin/kamailio[20259]: ERROR: rls [subscribe.c:678]: occured in rls_handle_subscribe I believe this is happening because send_full_notify() is called after update_rlsubs() is called in rls_handle_subscribe(). update_rlsubs() will delete the entry from the hash table when "Expires: 0" is set - as is the case for an unSUBSCRIBE. Can anyone suggest what the correct behaviour should be? Thanks, Peter

13 years, 7 months

Kamailio at Google Summer of Code 2011

by Daniel-Constantin Mierla

Hello, for the second year, Kamailio is participating in GSoC program. For 2011, the proposal is to implement a signaling gateway between SIP and JINGLE to enable voice calls between the two networks: http://www.jitsi.org/index.php/GSOC2011/KamailioJingle If you are a student, or you know a student, interested in this project, just write me or to sr-dev(a)lists.sip-router.org. The application starts today and the deadline is April 8, therefore it is quite a short period, you will have to hurry. You can read more about the GSoC program and Kamailio at: http://www.kamailio.org/w/gsoc-2011/ http://www.jitsi.org/index.php/Development/Gsoc2011 Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

13 years, 7 months

git:master: rls(k): safer build of chunked body

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 26d8a3fbfbc519535b31b3bae7b5c57d89c2652a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26d8a3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 13:32:45 2011 +0200 rls(k): safer build of chunked body - the check for the size of alloc'ed buffer was using static estimation, not it is cmputed based on values and makes sure the ending '\0' is safe as well. When handling bodies with long values, could have caused overflow - reported by Peter Dunkley (cherry picked from commit a1b10bff76e1a88c647612c30b12eb5e9e51c90e) --- modules_k/rls/notify.c | 50 +++++++++++++++++++++++--------------- modules_k/rls/notify.h | 1 - modules_k/rls/resource_notify.c | 37 +++++++++++++++++++--------- 3 files changed, 55 insertions(+), 33 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index d414eeb..06c4ed3 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -472,11 +472,12 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, int i, length= 0; db_row_t *row; db_val_t *row_vals; - char* content_id= NULL; + str content_id = {0, 0}; str body= {0, 0}; - str ctype= {0, 0}; - int antet_len; + str content_type= {0, 0}; + int chunk_len; str* multi_body= NULL; + str bstr = {0, 0}; LM_DBG("start\n"); buf= pkg_malloc(size* sizeof(char)); @@ -485,7 +486,8 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, ERR_MEM(PKG_MEM_STR); } - antet_len= COMPUTE_ANTET_LEN (boundary_string); + bstr.s = boundary_string; + bstr.len = strlen(bstr.s); for(i= 0; i< result->n; i++) { @@ -498,29 +500,37 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, body.s= (char*)row_vals[pres_state_col].val.string_val; body.len= strlen(body.s); trim(&body); - ctype.s = (char*)row_vals[content_type_col].val.string_val; - ctype.len = strlen(ctype.s); - - if(length+ antet_len+ body.len+ 4 > size) - { - REALLOC_BUF - } - - length+= sprintf(buf+ length, "--%s\r\n\r\n", boundary_string); - length+= sprintf(buf+ length, "Content-Transfer-Encoding: binary\r\n"); - content_id= cid_array[i]; - if(content_id== NULL) + content_type.s = (char*)row_vals[content_type_col].val.string_val; + content_type.len = strlen(content_type.s); + content_id.s= cid_array[i]; + if(content_id.s== NULL) { LM_ERR("No cid found in array for uri= %s\n", row_vals[resource_uri_col].val.string_val); goto error; } + content_id.len = strlen(content_id.s); + - length+= sprintf(buf+ length, "Content-ID: <%s>\r\n",content_id); + chunk_len = 4 + bstr.len + + 35 + + 16 + content_id.len + + 18 + content_type.len + + 4 + body.len + 8; + if(length + chunk_len >= size) + { + REALLOC_BUF + } + + length+= sprintf(buf+ length, "--%.*s\r\n", + bstr.len, bstr.s); + length+= sprintf(buf+ length, "Content-Transfer-Encoding: binary\r\n"); + length+= sprintf(buf+ length, "Content-ID: <%.*s>\r\n", + content_id.len, content_id.s); length+= sprintf(buf+ length, "Content-Type: %.*s\r\n\r\n", - ctype.len, ctype.s); - - length+= sprintf(buf+length,"%.*s\r\n\r\n", body.len, body.s); + content_type.len, content_type.s); + length+= sprintf(buf+length,"%.*s\r\n\r\n", + body.len, body.s); } if(length+ strlen( boundary_string)+ 7> size ) diff --git a/modules_k/rls/notify.h b/modules_k/rls/notify.h index e189e63..764ae5e 100644 --- a/modules_k/rls/notify.h +++ b/modules_k/rls/notify.h @@ -46,7 +46,6 @@ if(buf== NULL) \ { ERR_MEM("constr_multipart_body");} -#define COMPUTE_ANTET_LEN(boundary_string) (strlen( boundary_string)+ MAX_HEADERS_LENGTH + 6) int send_full_notify(subs_t* subs, xmlNodePtr rl_node, int version, str* rl_uri, unsigned int hash_code); diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 0caf7cb..f93ebe0 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -482,8 +482,11 @@ void timer_send_notify(unsigned int ticks,void *param) unsigned int hash_code= 0; int len; int size= BUF_REALLOC_SIZE, buf_len= 0; - char* buf= NULL, *auth_state= NULL, *boundary_string= NULL, *cid= NULL; - int contor= 0, auth_state_flag, antet_len; + char* buf= NULL, *auth_state= NULL, *boundary_string= NULL; + str cid = {0,0}; + str content_type = {0,0}; + int contor= 0, auth_state_flag; + int chunk_len; str bstr= {0, 0}; str rlmi_cont= {0, 0}, multi_cont; subs_t* s, *dialog= NULL; @@ -557,7 +560,6 @@ void timer_send_notify(unsigned int ticks,void *param) ERR_MEM(PKG_MEM_STR); } - antet_len= COMPUTE_ANTET_LEN(bstr.s); LM_DBG("found %d records with updated state\n", result->n); for(i= 0; i< result->n; i++) { @@ -686,7 +688,8 @@ void timer_send_notify(unsigned int ticks,void *param) while(1) { contor++; - cid= NULL; + cid.s= NULL; + cid.len= 0; instance_node= xmlNewChild(resource_node, NULL, BAD_CAST "instance", NULL); if(instance_node== NULL) @@ -707,8 +710,8 @@ void timer_send_notify(unsigned int ticks,void *param) if(auth_state_flag & ACTIVE_STATE) { - cid= generate_cid(resource_uri, strlen(resource_uri)); - xmlNewProp(instance_node, BAD_CAST "cid", BAD_CAST cid); + cid.s= generate_cid(resource_uri, strlen(resource_uri)); + xmlNewProp(instance_node, BAD_CAST "cid", BAD_CAST cid.s); } else if(auth_state_flag & TERMINATED_STATE) @@ -718,18 +721,28 @@ void timer_send_notify(unsigned int ticks,void *param) } /* add in the multipart buffer */ - if(cid) + if(cid.s) { - if(buf_len+ antet_len+ pres_state.len+ 4 > size) + cid.len = strlen(cid.s); + content_type.s = (char*)row_vals[content_type_col].val.string_val; + content_type.len = strlen(content_type.s); + chunk_len = 4 + bstr.len + + 35 + + 16 + cid.len + + 18 + content_type.len + + 4 + pres_state.len + 8; + if(buf_len + chunk_len >= size) { REALLOC_BUF } - buf_len+= sprintf(buf+ buf_len, "--%s\r\n", bstr.s); + buf_len+= sprintf(buf+ buf_len, "--%.*s\r\n", bstr.len, + bstr.s); buf_len+= sprintf(buf+ buf_len, "Content-Transfer-Encoding: binary\r\n"); - buf_len+= sprintf(buf+ buf_len, "Content-ID: <%s>\r\n", cid); - buf_len+= sprintf(buf+ buf_len, "Content-Type: %s\r\n\r\n", - row_vals[content_type_col].val.string_val); + buf_len+= sprintf(buf+ buf_len, "Content-ID: <%.*s>\r\n", + cid.len, cid.s); + buf_len+= sprintf(buf+ buf_len, "Content-Type: %.*s\r\n\r\n", + content_type.len, content_type.s); buf_len+= sprintf(buf+buf_len,"%.*s\r\n\r\n", pres_state.len, pres_state.s); }

13 years, 7 months

git:3.1: rls(k): safer build of chunked body

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: a1b10bff76e1a88c647612c30b12eb5e9e51c90e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1b10bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 13:32:45 2011 +0200 rls(k): safer build of chunked body - the check for the size of alloc'ed buffer was using static estimation, not it is cmputed based on values and makes sure the ending '\0' is safe as well. When handling bodies with long values, could have caused overflow - reported by Peter Dunkley --- modules_k/rls/notify.c | 50 +++++++++++++++++++++++--------------- modules_k/rls/notify.h | 1 - modules_k/rls/resource_notify.c | 37 +++++++++++++++++++--------- 3 files changed, 55 insertions(+), 33 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index d414eeb..06c4ed3 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -472,11 +472,12 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, int i, length= 0; db_row_t *row; db_val_t *row_vals; - char* content_id= NULL; + str content_id = {0, 0}; str body= {0, 0}; - str ctype= {0, 0}; - int antet_len; + str content_type= {0, 0}; + int chunk_len; str* multi_body= NULL; + str bstr = {0, 0}; LM_DBG("start\n"); buf= pkg_malloc(size* sizeof(char)); @@ -485,7 +486,8 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, ERR_MEM(PKG_MEM_STR); } - antet_len= COMPUTE_ANTET_LEN (boundary_string); + bstr.s = boundary_string; + bstr.len = strlen(bstr.s); for(i= 0; i< result->n; i++) { @@ -498,29 +500,37 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, body.s= (char*)row_vals[pres_state_col].val.string_val; body.len= strlen(body.s); trim(&body); - ctype.s = (char*)row_vals[content_type_col].val.string_val; - ctype.len = strlen(ctype.s); - - if(length+ antet_len+ body.len+ 4 > size) - { - REALLOC_BUF - } - - length+= sprintf(buf+ length, "--%s\r\n\r\n", boundary_string); - length+= sprintf(buf+ length, "Content-Transfer-Encoding: binary\r\n"); - content_id= cid_array[i]; - if(content_id== NULL) + content_type.s = (char*)row_vals[content_type_col].val.string_val; + content_type.len = strlen(content_type.s); + content_id.s= cid_array[i]; + if(content_id.s== NULL) { LM_ERR("No cid found in array for uri= %s\n", row_vals[resource_uri_col].val.string_val); goto error; } + content_id.len = strlen(content_id.s); + - length+= sprintf(buf+ length, "Content-ID: <%s>\r\n",content_id); + chunk_len = 4 + bstr.len + + 35 + + 16 + content_id.len + + 18 + content_type.len + + 4 + body.len + 8; + if(length + chunk_len >= size) + { + REALLOC_BUF + } + + length+= sprintf(buf+ length, "--%.*s\r\n", + bstr.len, bstr.s); + length+= sprintf(buf+ length, "Content-Transfer-Encoding: binary\r\n"); + length+= sprintf(buf+ length, "Content-ID: <%.*s>\r\n", + content_id.len, content_id.s); length+= sprintf(buf+ length, "Content-Type: %.*s\r\n\r\n", - ctype.len, ctype.s); - - length+= sprintf(buf+length,"%.*s\r\n\r\n", body.len, body.s); + content_type.len, content_type.s); + length+= sprintf(buf+length,"%.*s\r\n\r\n", + body.len, body.s); } if(length+ strlen( boundary_string)+ 7> size ) diff --git a/modules_k/rls/notify.h b/modules_k/rls/notify.h index e189e63..764ae5e 100644 --- a/modules_k/rls/notify.h +++ b/modules_k/rls/notify.h @@ -46,7 +46,6 @@ if(buf== NULL) \ { ERR_MEM("constr_multipart_body");} -#define COMPUTE_ANTET_LEN(boundary_string) (strlen( boundary_string)+ MAX_HEADERS_LENGTH + 6) int send_full_notify(subs_t* subs, xmlNodePtr rl_node, int version, str* rl_uri, unsigned int hash_code); diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 0caf7cb..f93ebe0 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -482,8 +482,11 @@ void timer_send_notify(unsigned int ticks,void *param) unsigned int hash_code= 0; int len; int size= BUF_REALLOC_SIZE, buf_len= 0; - char* buf= NULL, *auth_state= NULL, *boundary_string= NULL, *cid= NULL; - int contor= 0, auth_state_flag, antet_len; + char* buf= NULL, *auth_state= NULL, *boundary_string= NULL; + str cid = {0,0}; + str content_type = {0,0}; + int contor= 0, auth_state_flag; + int chunk_len; str bstr= {0, 0}; str rlmi_cont= {0, 0}, multi_cont; subs_t* s, *dialog= NULL; @@ -557,7 +560,6 @@ void timer_send_notify(unsigned int ticks,void *param) ERR_MEM(PKG_MEM_STR); } - antet_len= COMPUTE_ANTET_LEN(bstr.s); LM_DBG("found %d records with updated state\n", result->n); for(i= 0; i< result->n; i++) { @@ -686,7 +688,8 @@ void timer_send_notify(unsigned int ticks,void *param) while(1) { contor++; - cid= NULL; + cid.s= NULL; + cid.len= 0; instance_node= xmlNewChild(resource_node, NULL, BAD_CAST "instance", NULL); if(instance_node== NULL) @@ -707,8 +710,8 @@ void timer_send_notify(unsigned int ticks,void *param) if(auth_state_flag & ACTIVE_STATE) { - cid= generate_cid(resource_uri, strlen(resource_uri)); - xmlNewProp(instance_node, BAD_CAST "cid", BAD_CAST cid); + cid.s= generate_cid(resource_uri, strlen(resource_uri)); + xmlNewProp(instance_node, BAD_CAST "cid", BAD_CAST cid.s); } else if(auth_state_flag & TERMINATED_STATE) @@ -718,18 +721,28 @@ void timer_send_notify(unsigned int ticks,void *param) } /* add in the multipart buffer */ - if(cid) + if(cid.s) { - if(buf_len+ antet_len+ pres_state.len+ 4 > size) + cid.len = strlen(cid.s); + content_type.s = (char*)row_vals[content_type_col].val.string_val; + content_type.len = strlen(content_type.s); + chunk_len = 4 + bstr.len + + 35 + + 16 + cid.len + + 18 + content_type.len + + 4 + pres_state.len + 8; + if(buf_len + chunk_len >= size) { REALLOC_BUF } - buf_len+= sprintf(buf+ buf_len, "--%s\r\n", bstr.s); + buf_len+= sprintf(buf+ buf_len, "--%.*s\r\n", bstr.len, + bstr.s); buf_len+= sprintf(buf+ buf_len, "Content-Transfer-Encoding: binary\r\n"); - buf_len+= sprintf(buf+ buf_len, "Content-ID: <%s>\r\n", cid); - buf_len+= sprintf(buf+ buf_len, "Content-Type: %s\r\n\r\n", - row_vals[content_type_col].val.string_val); + buf_len+= sprintf(buf+ buf_len, "Content-ID: <%.*s>\r\n", + cid.len, cid.s); + buf_len+= sprintf(buf+ buf_len, "Content-Type: %.*s\r\n\r\n", + content_type.len, content_type.s); buf_len+= sprintf(buf+buf_len,"%.*s\r\n\r\n", pres_state.len, pres_state.s); }

13 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011