sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

git:4.0: modules/xcap_server: fixed fetching of an element (GET with XPath)

by Peter Dunkley

Module: sip-router Branch: 4.0 Commit: c035965d7ed820470d4aedc4dc1dca7e048906b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c035965… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 23 14:53:04 2013 +0100 modules/xcap_server: fixed fetching of an element (GET with XPath) - This is a mandatory part of XCAP and DELETE/PUT of elements (using XPath) is supported in xcap_server. - The code to get a node from a document was all in there but never called. (cherry picked from commit 6b8b8a050e4490302d1f1f940a7fda95784cce46) --- modules/xcap_server/xcap_misc.c | 6 +- modules/xcap_server/xcap_server.c | 81 ++++++++++++++++++++++++++++--------- 2 files changed, 64 insertions(+), 23 deletions(-) diff --git a/modules/xcap_server/xcap_misc.c b/modules/xcap_server/xcap_misc.c index 7ca891e..da8bb59 100644 --- a/modules/xcap_server/xcap_misc.c +++ b/modules/xcap_server/xcap_misc.c @@ -334,15 +334,15 @@ int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf) LM_ERR("unable to evaluate xpath expression [%s]\n", xpaths->s); goto error; } - nodes = xpathObj->nodesetval; - if(nodes==NULL) + nodes = xpathObj->nodesetval; + if(nodes==NULL || nodes->nodeNr==0 || nodes->nodeTab == NULL) { outbuf->len = 0; outbuf->s[outbuf->len] = '\0'; goto done; } size = nodes->nodeNr; - p = outbuf->s; + p = outbuf->s; end = outbuf->s + outbuf->len; for(i = 0; i < size; ++i) { diff --git a/modules/xcap_server/xcap_server.c b/modules/xcap_server/xcap_server.c index 8bc14eb..372fc39 100644 --- a/modules/xcap_server/xcap_server.c +++ b/modules/xcap_server/xcap_server.c @@ -1070,7 +1070,8 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) str uri; str path; str etag = {0, 0}; - str body; + str body = {0, 0}; + str new_body = {0, 0}; int ret = 0; xcap_uri_t xuri; str *ctype; @@ -1170,37 +1171,77 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) LM_ERR("could not fetch xcap document\n"); goto error; } - - if(ret==0) + if(ret!=0) { - /* doc found */ - ctype = &xcaps_str_appxml; - if(xuri.type==RESOURCE_LIST) - ctype = &xcaps_str_apprlxml; - else if(xuri.type==PRES_RULES) - ctype = &xcaps_str_appapxml; - else if(xuri.type==RLS_SERVICE) - ctype = &xcaps_str_apprsxml; - else if(xuri.type==USER_PROFILE) - ctype = &xcaps_str_appupxml; - else if(xuri.type==PRES_CONTENT) - ctype = &xcaps_str_apppcxml; - else if(xuri.type==PIDF_MANIPULATION) - ctype = &xcaps_str_apppdxml; - xcaps_send_reply(msg, 200, &xcaps_str_ok, &etag, - ctype, &body); - } else { /* doc not found */ xcaps_send_reply(msg, 404, &xcaps_str_notfound, NULL, NULL, NULL); + break; + } + + if(xuri.nss!=NULL && xuri.node.len>0) + { + if((new_body.s = pkg_malloc(body.len))==NULL) + { + LM_ERR("allocating package memory\n"); + goto error; + } + new_body.len = body.len; + + if(xcaps_xpath_hack(&body, 0)<0) + { + LM_ERR("could not hack xcap document\n"); + goto error; + } + if(xcaps_xpath_get(&body, &xuri.node, &new_body)<0) + { + LM_ERR("could not retrieve element from xcap document\n"); + goto error; + } + if(new_body.len<=0) + { + /* element not found */ + xcaps_send_reply(msg, 404, &xcaps_str_notfound, NULL, + NULL, NULL); + pkg_free(new_body.s); + new_body.s = NULL; + break; + } + if(xcaps_xpath_hack(&new_body, 1)<0) + { + LM_ERR("could not hack xcap document\n"); + goto error; + } + memcpy(body.s, new_body.s, new_body.len); + body.len = new_body.len; + pkg_free(new_body.s); + new_body.s = NULL; } + /* doc or element found */ + ctype = &xcaps_str_appxml; + if(xuri.type==RESOURCE_LIST) + ctype = &xcaps_str_apprlxml; + else if(xuri.type==PRES_RULES) + ctype = &xcaps_str_appapxml; + else if(xuri.type==RLS_SERVICE) + ctype = &xcaps_str_apprsxml; + else if(xuri.type==USER_PROFILE) + ctype = &xcaps_str_appupxml; + else if(xuri.type==PRES_CONTENT) + ctype = &xcaps_str_apppcxml; + else if(xuri.type==PIDF_MANIPULATION) + ctype = &xcaps_str_apppdxml; + xcaps_send_reply(msg, 200, &xcaps_str_ok, &etag, + ctype, &body); + break; } return 1; error: + if (new_body.s) pkg_free(new_body.s); xcaps_send_reply(msg, 500, &xcaps_str_srverr, NULL, NULL, NULL); return -1;

11 years, 2 months

git:master: modules/xcap_server: fixed fetching of an element ( GET with XPath)

by Peter Dunkley

Module: sip-router Branch: master Commit: 6b8b8a050e4490302d1f1f940a7fda95784cce46 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b8b8a0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 23 14:53:04 2013 +0100 modules/xcap_server: fixed fetching of an element (GET with XPath) - This is a mandatory part of XCAP and DELETE/PUT of elements (using XPath) is supported in xcap_server. - The code to get a node from a document was all in there but never called. --- modules/xcap_server/xcap_misc.c | 6 +- modules/xcap_server/xcap_server.c | 81 ++++++++++++++++++++++++++++--------- 2 files changed, 64 insertions(+), 23 deletions(-) diff --git a/modules/xcap_server/xcap_misc.c b/modules/xcap_server/xcap_misc.c index 7ca891e..da8bb59 100644 --- a/modules/xcap_server/xcap_misc.c +++ b/modules/xcap_server/xcap_misc.c @@ -334,15 +334,15 @@ int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf) LM_ERR("unable to evaluate xpath expression [%s]\n", xpaths->s); goto error; } - nodes = xpathObj->nodesetval; - if(nodes==NULL) + nodes = xpathObj->nodesetval; + if(nodes==NULL || nodes->nodeNr==0 || nodes->nodeTab == NULL) { outbuf->len = 0; outbuf->s[outbuf->len] = '\0'; goto done; } size = nodes->nodeNr; - p = outbuf->s; + p = outbuf->s; end = outbuf->s + outbuf->len; for(i = 0; i < size; ++i) { diff --git a/modules/xcap_server/xcap_server.c b/modules/xcap_server/xcap_server.c index 8bc14eb..372fc39 100644 --- a/modules/xcap_server/xcap_server.c +++ b/modules/xcap_server/xcap_server.c @@ -1070,7 +1070,8 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) str uri; str path; str etag = {0, 0}; - str body; + str body = {0, 0}; + str new_body = {0, 0}; int ret = 0; xcap_uri_t xuri; str *ctype; @@ -1170,37 +1171,77 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) LM_ERR("could not fetch xcap document\n"); goto error; } - - if(ret==0) + if(ret!=0) { - /* doc found */ - ctype = &xcaps_str_appxml; - if(xuri.type==RESOURCE_LIST) - ctype = &xcaps_str_apprlxml; - else if(xuri.type==PRES_RULES) - ctype = &xcaps_str_appapxml; - else if(xuri.type==RLS_SERVICE) - ctype = &xcaps_str_apprsxml; - else if(xuri.type==USER_PROFILE) - ctype = &xcaps_str_appupxml; - else if(xuri.type==PRES_CONTENT) - ctype = &xcaps_str_apppcxml; - else if(xuri.type==PIDF_MANIPULATION) - ctype = &xcaps_str_apppdxml; - xcaps_send_reply(msg, 200, &xcaps_str_ok, &etag, - ctype, &body); - } else { /* doc not found */ xcaps_send_reply(msg, 404, &xcaps_str_notfound, NULL, NULL, NULL); + break; + } + + if(xuri.nss!=NULL && xuri.node.len>0) + { + if((new_body.s = pkg_malloc(body.len))==NULL) + { + LM_ERR("allocating package memory\n"); + goto error; + } + new_body.len = body.len; + + if(xcaps_xpath_hack(&body, 0)<0) + { + LM_ERR("could not hack xcap document\n"); + goto error; + } + if(xcaps_xpath_get(&body, &xuri.node, &new_body)<0) + { + LM_ERR("could not retrieve element from xcap document\n"); + goto error; + } + if(new_body.len<=0) + { + /* element not found */ + xcaps_send_reply(msg, 404, &xcaps_str_notfound, NULL, + NULL, NULL); + pkg_free(new_body.s); + new_body.s = NULL; + break; + } + if(xcaps_xpath_hack(&new_body, 1)<0) + { + LM_ERR("could not hack xcap document\n"); + goto error; + } + memcpy(body.s, new_body.s, new_body.len); + body.len = new_body.len; + pkg_free(new_body.s); + new_body.s = NULL; } + /* doc or element found */ + ctype = &xcaps_str_appxml; + if(xuri.type==RESOURCE_LIST) + ctype = &xcaps_str_apprlxml; + else if(xuri.type==PRES_RULES) + ctype = &xcaps_str_appapxml; + else if(xuri.type==RLS_SERVICE) + ctype = &xcaps_str_apprsxml; + else if(xuri.type==USER_PROFILE) + ctype = &xcaps_str_appupxml; + else if(xuri.type==PRES_CONTENT) + ctype = &xcaps_str_apppcxml; + else if(xuri.type==PIDF_MANIPULATION) + ctype = &xcaps_str_apppdxml; + xcaps_send_reply(msg, 200, &xcaps_str_ok, &etag, + ctype, &body); + break; } return 1; error: + if (new_body.s) pkg_free(new_body.s); xcaps_send_reply(msg, 500, &xcaps_str_srverr, NULL, NULL, NULL); return -1;

11 years, 2 months

Compile warnings for default module set under Ubuntu 13.10

by Peter Dunkley

GCC version is 4.8.1 I was compiling Git master on my laptop for some testing and saw these warnings: *Note: I was only compiling the default module set (so there might be more warnings in modules outside of that set).* *mi_rpc.so (building libbinrpc.so.0.1)* binrpc_api.c: In function ‘binrpc_response_to_text’: binrpc_api.c:1044:82: warning: ‘val.u.strval.len’ may be used uninitialized in this function [-Wmaybe-uninitialized] *buf_len += (TEXT_BUFF_ALLOC_CHUNK < req_len) ? TEXT_BUFF_ALLOC_CHUNK + req_len : TEXT_BUFF_ALLOC_CHUNK; ^ binrpc_api.c:1154:20: note: ‘val.u.strval.len’ was declared here struct binrpc_val val; ^ *pike.so* pike_top.c: In function ‘pike_top_print_addr’: pike_top.c:23:25: warning: argument to ‘sizeof’ in ‘memset’ call is the same expression as the destination; did you mean to provide an explicit length? [-Wsizeof-pointer-memaccess] memset( buff, 0, sizeof(buff)); ^ *sca.so* sca_call_info.c: In function ‘sca_call_info_update’: sca_call_info.h:51:9: warning: the comparison will always evaluate as ‘true’ for the address of ‘call_info’ will never be NULL [-Waddress] ((ci1) != NULL || \ ^ sca_call_info.h:56:4: note: in expansion of macro ‘SCA_CALL_INFO_EMPTY’ (!SCA_CALL_INFO_EMPTY((ci1)) && \ ^ sca_call_info.c:1977:7: note: in expansion of macro ‘SCA_CALL_INFO_IS_SHARED_CALLER’ if ( SCA_CALL_INFO_IS_SHARED_CALLER( &call_info ) && ^ sca_call_info.h:51:9: warning: the comparison will always evaluate as ‘true’ for the address of ‘call_info’ will never be NULL [-Waddress] ((ci1) != NULL || \ ^ sca_call_info.h:60:4: note: in expansion of macro ‘SCA_CALL_INFO_EMPTY’ (!SCA_CALL_INFO_EMPTY((ci1)) && \ ^ sca_call_info.c:1984:14: note: in expansion of macro ‘SCA_CALL_INFO_IS_SHARED_CALLEE’ } else if ( SCA_CALL_INFO_IS_SHARED_CALLEE( &call_info ) && ^ *seas.so* event_dispatcher.c: In function ‘dispatcher_main_loop’: event_dispatcher.c:271:27: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].fd=poll_fds[j+1].fd; ^ event_dispatcher.c:272:31: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].events=poll_fds[j+1].events; ^ event_dispatcher.c:273:32: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].revents=poll_fds[j+1].revents; ^ event_dispatcher.c:271:27: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].fd=poll_fds[j+1].fd; ^ event_dispatcher.c:271:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].fd=poll_fds[j+1].fd; ^ event_dispatcher.c:272:31: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].events=poll_fds[j+1].events; ^ event_dispatcher.c:272:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].events=poll_fds[j+1].events; ^ event_dispatcher.c:273:32: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].revents=poll_fds[j+1].revents; ^ event_dispatcher.c:273:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].revents=poll_fds[j+1].revents; ^ event_dispatcher.c:271:27: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].fd=poll_fds[j+1].fd; ^ event_dispatcher.c:271:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].fd=poll_fds[j+1].fd; ^ event_dispatcher.c:272:31: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].events=poll_fds[j+1].events; ^ event_dispatcher.c:272:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].events=poll_fds[j+1].events; ^ event_dispatcher.c:273:32: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].revents=poll_fds[j+1].revents; ^ event_dispatcher.c:273:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].revents=poll_fds[j+1].revents; ^ event_dispatcher.c:271:27: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].fd=poll_fds[j+1].fd; ^ event_dispatcher.c:271:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].fd=poll_fds[j+1].fd; ^ event_dispatcher.c:272:31: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].events=poll_fds[j+1].events; ^ event_dispatcher.c:272:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].events=poll_fds[j+1].events; ^ event_dispatcher.c:273:32: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].revents=poll_fds[j+1].revents; ^ event_dispatcher.c:273:12: warning: array subscript is above array bounds [-Warray-bounds] poll_fds[j].revents=poll_fds[j+1].revents; ^ *sms.so* libsms_modem.c: In function ‘put_command’: libsms_modem.c:77:7: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result [-Wunused-result] write(mdm->fd,cmd,cmd_len); ^ Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 2 months

Compile warnings for Kamailio core under Ubuntu 13.10

by Peter Dunkley

GCC version is 4.8.1 I was compiling Git master on my laptop for some testing and saw these warnings: cfg/cfg_ctx.c: In function ‘cfg_set_now’: cfg/cfg_ctx.c:490:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] group_inst = (cfg_group_inst_t *)translate_pointer((char *)new_array, ^ cfg/cfg_ctx.c:494:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:564:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (block && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array)) ^ cfg/cfg_ctx.c:564:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:565:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] new_array = CFG_GROUP_META(block, group)->array; ^ cfg/cfg_ctx.c:584:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[i] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c: In function ‘cfg_commit’: cfg/cfg_ctx.c:1125:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (!(CFG_GROUP_META(block, group)->array = ^ cfg/cfg_ctx.c:1133:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (CFG_GROUP_META(block, changed->group)->array != CFG_GROUP_META(*cfg_global, changed->group)->array) ^ cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1190:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c:1225:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(block, group)->array ^ cfg/cfg_ctx.c:1226:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array) ^ cfg/cfg_ctx.c:1226:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1228:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] shm_free(CFG_GROUP_META(block, group)->array);cfg/cfg_ctx.c: In function ‘cfg_set_now’: cfg/cfg_ctx.c:490:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] group_inst = (cfg_group_inst_t *)translate_pointer((char *)new_array, ^ cfg/cfg_ctx.c:494:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:564:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (block && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array)) ^ cfg/cfg_ctx.c:564:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:565:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] new_array = CFG_GROUP_META(block, group)->array; ^ cfg/cfg_ctx.c:584:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[i] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c: In function ‘cfg_commit’: cfg/cfg_ctx.c:1125:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (!(CFG_GROUP_META(block, group)->array = ^ cfg/cfg_ctx.c:1133:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (CFG_GROUP_META(block, changed->group)->array != CFG_GROUP_META(*cfg_global, changed->group)->array) ^ cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1190:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c:1225:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(block, group)->array ^ cfg/cfg_ctx.c:1226:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array) ^ cfg/cfg_ctx.c:1226:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1228:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] shm_free(CFG_GROUP_META(block, group)->array); ^ cfg/cfg_ctx.c: In function ‘cfg_add_group_inst’: cfg/cfg_ctx.c:1582:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:1583:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->num++; ^ cfg/cfg_ctx.c:1585:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(*cfg_global, group)->array) { ^ cfg/cfg_ctx.c:1594:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[0] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c: In function ‘cfg_del_group_inst’: cfg/cfg_ctx.c:1678:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:1679:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->num--; ^ cfg/cfg_ctx.c:1681:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(*cfg_global, group)->array) { ^ cfg/cfg_ctx.c:1692:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (*(char **)(group_inst->vars + var->offset) != NULL) ^ cfg/cfg_ctx.c:1710:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (*(char **)(group_inst->vars + var->offset) != NULL) ^ cfg/cfg_ctx.c:1712:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[num] = *(char **)(group_inst->vars + var->offset); ^ cfg/cfg_ctx.c:1718:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[num] = CFG_GROUP_META(*cfg_global, group)->array; ^ ^ cfg/cfg_ctx.c: In function ‘cfg_add_group_inst’: cfg/cfg_ctx.c:1582:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:1583:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->num++; ^ cfg/cfg_ctx.c:1585:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(*cfg_global, group)->array) { ^ cfg/cfg_ctx.c:1594:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[0] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c: In function ‘cfg_del_group_inst’: cfg/cfg_ctx.c:1678:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:1679:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->num--; ^ cfg/cfg_ctx.c:1681:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(*cfg_global, group)->array) { ^ cfg/cfg_ctx.c:1692:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (*(char **)(group_inst->vars + var->offset) != NULL) ^ cfg/cfg_ctx.c:1710:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (*(char **)(group_inst->vars + var->offset) != NULL) ^ cfg/cfg_ctx.c:1712:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[num] = *(char **)(group_inst->vars + var->offset); ^ cfg/cfg_ctx.c:1718:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[num] = CFG_GROUP_META(*cfg_global, group)->array; ^ Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 2 months

git:master: dmq: Fixed bug/ error in original code where sip_msg was parsed after cloning to shm, leading to memory errors. Also fixed several memory leaks.

by Charles Chance

Module: sip-router Branch: master Commit: 3b028d308fac3a4f7ae1e74021882657753f2ee8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b028d3… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Wed Oct 23 12:01:27 2013 +0100 dmq: Fixed bug/error in original code where sip_msg was parsed after cloning to shm, leading to memory errors. Also fixed several memory leaks. --- modules/dmq/dmqnode.c | 22 ++++++++++------------ modules/dmq/message.c | 10 +--------- modules/dmq/notification_peer.c | 5 ----- modules/dmq/worker.c | 34 ++++++++++++++++++++++++++++------ modules/dmq/worker.h | 1 + 5 files changed, 40 insertions(+), 32 deletions(-) diff --git a/modules/dmq/dmqnode.c b/modules/dmq/dmqnode.c index 5bf0fc3..bc7c108 100644 --- a/modules/dmq/dmqnode.c +++ b/modules/dmq/dmqnode.c @@ -203,12 +203,7 @@ dmq_node_t* build_dmq_node(str* uri, int shm) { error: if(ret!=NULL) { - /* tbd: free uri and params */ - if(shm) { - shm_free(ret); - } else { - pkg_free(ret); - } + destroy_dmq_node(ret, shm); } return NULL; } @@ -232,7 +227,6 @@ dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) */ void destroy_dmq_node(dmq_node_t* node, int shm) { - /* tbd: check inner fields */ if(shm) { shm_free_node(node); } else { @@ -278,9 +272,7 @@ dmq_node_t* shm_dup_node(dmq_node_t* node) } return newnode; error: - if(newnode->orig_uri.s!=NULL) - shm_free(newnode->orig_uri.s); - shm_free(newnode); + destroy_dmq_node(newnode, 1); return NULL; } @@ -289,7 +281,10 @@ error: */ void shm_free_node(dmq_node_t* node) { - shm_free(node->orig_uri.s); + if (node->orig_uri.s!=NULL) + shm_free(node->orig_uri.s); + if (node->params!=NULL) + shm_free_params(node->params); shm_free(node); } @@ -298,7 +293,10 @@ void shm_free_node(dmq_node_t* node) */ void pkg_free_node(dmq_node_t* node) { - pkg_free(node->orig_uri.s); + if (node->orig_uri.s!=NULL) + pkg_free(node->orig_uri.s); + if (node->params!=NULL) + free_params(node->params); pkg_free(node); } diff --git a/modules/dmq/message.c b/modules/dmq/message.c index 05b77f1..a695fee 100644 --- a/modules/dmq/message.c +++ b/modules/dmq/message.c @@ -26,7 +26,6 @@ #include "../../parser/parse_to.h" #include "../../parser/parse_uri.h" -#include "../../sip_msg_clone.h" #include "../../parser/parse_content.h" #include "../../parser/parse_from.h" #include "../../ut.h" @@ -46,8 +45,6 @@ str dmq_404_rpl = str_init("User Not Found"); int dmq_handle_message(struct sip_msg* msg, char* str1, char* str2) { dmq_peer_t* peer; - struct sip_msg* cloned_msg = NULL; - int cloned_msg_len; if ((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { LM_ERR("error parsing msg uri\n"); goto error; @@ -68,12 +65,7 @@ int dmq_handle_message(struct sip_msg* msg, char* str1, char* str2) return 0; } LM_DBG("dmq_handle_message peer found: %.*s\n", msg->parsed_uri.user.len, msg->parsed_uri.user.s); - cloned_msg = sip_msg_shm_clone(msg, &cloned_msg_len, 1); - if(!cloned_msg) { - LM_ERR("error cloning sip message\n"); - goto error; - } - if(add_dmq_job(cloned_msg, peer)<0) { + if(add_dmq_job(msg, peer)<0) { LM_ERR("failed to add dmq job\n"); goto error; } diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index eb48ee8..fc35618 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -162,11 +162,6 @@ int dmq_notification_callback(struct sip_msg* msg, peer_reponse_t* resp) unsigned int maxforwards = 1; /* received dmqnode list */ LM_DBG("dmq triggered from dmq_notification_callback\n"); - /* parse the message headers */ - if(parse_headers(msg, HDR_EOH_F, 0) < 0) { - LM_ERR("error parsing message headers\n"); - goto error; - } /* extract the maxforwards value, if any */ if(msg->maxforwards) { diff --git a/modules/dmq/worker.c b/modules/dmq/worker.c index a265712..3965f5a 100644 --- a/modules/dmq/worker.c +++ b/modules/dmq/worker.c @@ -28,6 +28,7 @@ #include "worker.h" #include "../../data_lump_rpl.h" #include "../../mod_fix.h" +#include "../../sip_msg_clone.h" /** * @brief set the body of a response @@ -131,17 +132,31 @@ void worker_loop(int id) int add_dmq_job(struct sip_msg* msg, dmq_peer_t* peer) { int i, found_available = 0; - int ret; dmq_job_t new_job = { 0 }; dmq_worker_t* worker; + struct sip_msg* cloned_msg = NULL; + int cloned_msg_len; + + /* Pre-parse headers so they are included in our clone. Parsing later + * will result in linking pkg structures to shm msg, eventually leading + * to memory errors. */ + if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse headers\n"); + return -1; + } + + cloned_msg = sip_msg_shm_clone(msg, &cloned_msg_len, 1); + if(!cloned_msg) { + LM_ERR("error cloning sip message\n"); + return -1; + } - ret = 0; new_job.f = peer->callback; - new_job.msg = msg; + new_job.msg = cloned_msg; new_job.orig_peer = peer; if(!num_workers) { LM_ERR("error in add_dmq_job: no workers spawned\n"); - return -1; + goto error; } /* initialize the worker with the first one */ worker = workers; @@ -162,9 +177,16 @@ int add_dmq_job(struct sip_msg* msg, dmq_peer_t* peer) " to the least busy one [%d %d]\n", worker->pid, job_queue_size(worker->queue)); } - ret = job_queue_push(worker->queue, &new_job); + if (job_queue_push(worker->queue, &new_job)<0) { + goto error; + } lock_release(&worker->lock); - return ret; + return 0; +error: + if (cloned_msg!=NULL) { + shm_free(cloned_msg); + } + return -1; } /** diff --git a/modules/dmq/worker.h b/modules/dmq/worker.h index bda80b4..8d0e0b7 100644 --- a/modules/dmq/worker.h +++ b/modules/dmq/worker.h @@ -30,6 +30,7 @@ #include "../../atomic_ops.h" #include "../../parser/msg_parser.h" + typedef struct dmq_job { peer_callback_t f; struct sip_msg* msg;

11 years, 2 months

[tracker] Comment added: equals $null and 0 return the same

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#358 - equals $null and 0 return the same User who did this - Víctor Seva (linuxmaniac) ---------- Maybe this is related to FS#141 ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=358#comment1126 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.

11 years, 2 months

[tracker] Task opened: equals $null and 0 return the same

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - equals $null and 0 return the same Task Type - Bug Report Category - Core Status - New Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - <code> request_route { $avp(x)=0; if($avp(x)==$null) { xlog("L_INFO","$$avp(x)==$$null\n"); } else { xlog("L_INFO","$$avp(x)!=$$null\n"); } if(is_avp_set("$avp(x)")) { xlog("L_INFO","$$avp(x) is set\n"); } else { xlog("L_INFO","$$avp(x) is not set\n"); } $avp(y)=$null; if($avp(y)==0) { xlog("L_INFO","$$avp(y)==0\n"); } else { xlog("L_INFO","$$avp(y)!=0\n"); } if(is_avp_set("$avp(y)")) { xlog("L_INFO","$$avp(y) is set\n"); } else { xlog("L_INFO","$$avp(y) is not set\n"); } } </code> So $avp(x) is 0 and $avp(y) is not set Output: <code> Oct 23 12:32:35 guest-945GCM-S2L kamailio[5991]: INFO: <script>: $avp(x)==$null Oct 23 12:32:35 guest-945GCM-S2L kamailio[5991]: INFO: <script>: $avp(x) is set Oct 23 12:32:35 guest-945GCM-S2L kamailio[5991]: INFO: <script>: $avp(y)==0 Oct 23 12:32:35 guest-945GCM-S2L kamailio[5991]: INFO: <script>: $avp(y) is not set </code> More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=358 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.

11 years, 2 months

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

by Jason Penton

Module: sip-router Branch: master Commit: eb97ddb20368c019b331cfd09e793a0431d49940 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb97ddb… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Oct 22 20:59:26 2013 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

11 years, 2 months

git:master: modules/cdp: allow CDP child processes to respond to dynamic cfg changes

by Jason Penton

Module: sip-router Branch: master Commit: f6d530e68ffe9db11f5f148c51f8bff0b542f028 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6d530e… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Oct 22 20:57:52 2013 +0200 modules/cdp: allow CDP child processes to respond to dynamic cfg changes - this for example allows dumping pkg memory using core cfg variables similar to SIP workers, etc --- modules/cdp/diameter_peer.c | 7 +++++++ modules/cdp/mod.c | 3 +++ modules/cdp/receiver.c | 3 +++ modules/cdp/tcp_accept.c | 4 ++++ modules/cdp/timer.c | 3 +++ modules/cdp/worker.c | 3 +++ 6 files changed, 23 insertions(+), 0 deletions(-) diff --git a/modules/cdp/diameter_peer.c b/modules/cdp/diameter_peer.c index ce86e1a..6bb5da2 100644 --- a/modules/cdp/diameter_peer.c +++ b/modules/cdp/diameter_peer.c @@ -62,6 +62,7 @@ #include "session.h" #include "../../pt.h" +#include "../../cfg/cfg_struct.h" dp_config *config=0; /**< Configuration for this diameter peer */ @@ -304,6 +305,7 @@ int diameter_peer_start(int blocking) if (pid==0) { srandom(time(0)*k); snprintf(pt[process_no].desc, MAX_PT_DESC,"cdp worker child=%d", k ); + if (cfg_child_init()) return 0; worker_process(k); LM_CRIT("init_diameter_peer(): worker_process finished without exit!\n"); exit(-1); @@ -330,6 +332,7 @@ int diameter_peer_start(int blocking) srandom(time(0)*k); snprintf(pt[process_no].desc, MAX_PT_DESC, "cdp receiver peer unknown"); + if (cfg_child_init()) return 0; receiver_process(NULL); LM_CRIT("init_diameter_peer(): receiver_process finished without exit!\n"); exit(-1); @@ -349,6 +352,7 @@ int diameter_peer_start(int blocking) srandom(time(0)*k); snprintf(pt[process_no].desc, MAX_PT_DESC, "cdp_receiver_peer=%.*s", p->fqdn.len,p->fqdn.s ); + if (cfg_child_init()) return 0; receiver_process(p); LM_CRIT("init_diameter_peer(): receiver_process finished without exit!\n"); exit(-1); @@ -367,6 +371,7 @@ int diameter_peer_start(int blocking) return 0; } if (pid==0) { + if (cfg_child_init()) return 0; acceptor_process(config); LM_CRIT("init_diameter_peer(): acceptor_process finished without exit!\n"); exit(-1); @@ -377,6 +382,7 @@ int diameter_peer_start(int blocking) /* fork/become timer */ if (blocking) { dp_add_pid(getpid()); + if (cfg_child_init()) return 0; timer_process(1); } else{ @@ -386,6 +392,7 @@ int diameter_peer_start(int blocking) return 0; } if (pid==0) { + if (cfg_child_init()) return 0; timer_process(0); LM_CRIT("init_diameter_peer(): timer_process finished without exit!\n"); exit(-1); diff --git a/modules/cdp/mod.c b/modules/cdp/mod.c index 258a710..0f12b4c 100644 --- a/modules/cdp/mod.c +++ b/modules/cdp/mod.c @@ -52,6 +52,8 @@ #include "config.h" #include "cdp_load.h" +#include "../../cfg/cfg_struct.h" + MODULE_VERSION char* config_file="DiameterPeer.xml"; /**< default DiameterPeer configuration filename */ @@ -219,6 +221,7 @@ static int cdp_init( void ) return 1; } register_procs(2+config->workers + 2 * config->peers_cnt); + cfg_register_child(2+config->workers + 2 * config->peers_cnt); return 0; } diff --git a/modules/cdp/receiver.c b/modules/cdp/receiver.c index 538b233..5762694 100644 --- a/modules/cdp/receiver.c +++ b/modules/cdp/receiver.c @@ -69,6 +69,8 @@ #include "receiver.h" +#include "../../cfg/cfg_struct.h" + extern dp_config *config; /**< Configuration for this diameter peer */ int dp_add_pid(pid_t pid); @@ -643,6 +645,7 @@ int receive_loop(peer *original_peer) while(!n){ if (shutdownx&&*shutdownx) break; + cfg_update(); log_serviced_peers(); diff --git a/modules/cdp/tcp_accept.c b/modules/cdp/tcp_accept.c index fdf3dd3..473f14b 100644 --- a/modules/cdp/tcp_accept.c +++ b/modules/cdp/tcp_accept.c @@ -63,6 +63,8 @@ #include "tcp_accept.h" #include "receiver.h" +#include "../../cfg/cfg_struct.h" + /* defined in ../diameter_peer.c */ int dp_add_pid(pid_t pid); @@ -205,6 +207,8 @@ void accept_loop() while(1){ if (shutdownx && *shutdownx) break; + cfg_update(); + timeout.tv_sec=2; timeout.tv_usec=0; FD_ZERO(&listen_set); diff --git a/modules/cdp/timer.c b/modules/cdp/timer.c index 0ac18c5..17be7de 100644 --- a/modules/cdp/timer.c +++ b/modules/cdp/timer.c @@ -53,6 +53,8 @@ #include "timer.h" +#include "../../cfg/cfg_struct.h" + /* defined in ../diameter_peer.c */ int dp_add_pid(pid_t pid); @@ -83,6 +85,7 @@ void timer_loop() while(1){ if (shutdownx && *shutdownx) break; now = time(0); + cfg_update(); do { cb = 0; diff --git a/modules/cdp/worker.c b/modules/cdp/worker.c index b4d4fb9..45cffe6 100644 --- a/modules/cdp/worker.c +++ b/modules/cdp/worker.c @@ -57,6 +57,8 @@ #include "worker.h" #include "diameter_api.h" +#include "../../cfg/cfg_struct.h" + /* defined in ../diameter_peer.c */ int dp_add_pid(pid_t pid); void dp_del_pid(pid_t pid); @@ -315,6 +317,7 @@ void worker_process(int id) { /* init the application level for this child */ while (1) { if (shutdownx && (*shutdownx)) break; + cfg_update(); t = take_task(); if (!t.msg) { if (shutdownx && (*shutdownx)) break;

11 years, 2 months

XCAP server does not support fetching an element

by Peter Dunkley

Inserting/replacing/deleting elements does work. When you do a GET xcap_server.c:w_xcaps_get() fetches the document from the DB and always returns it whole (regardless of whether or not the XCAP URI contained an XPath). There is a function that looks like is meant to perform an element fetch (xcap_misc.c:xcaps_xpath_get()) but it is not called by anything in xcap_server. Further, comparing xcap_misc.c:xcaps_xpath_get() with xcap_misc.c:xcaps_xpath_set() makes me thing the _get() function has never been tested and won't work properly. Specifically, the indentation, memory allocation, and pointer checking is a different between the functions so I suspect the _set() function has had some bug fixes that the _get() function has not. Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
26
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 2013