sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

[kamailio/kamailio] cancel the branches instantly instead of on provisional replies (#909)
by aqsyounas 25 Nov '19

25 Nov '19

I am forking a call to multiple destinations and want to keep the only branch which sends quicker provisional 180/183 reply and cancel the remaining branches. Below is my related cfg snippet. modparam("tm", "failure_reply_mode", 3) modparam("tm", "fr_timer", 30000) modparam("tm", "fr_inv_timer", 120000) modparam("tm", "cancel_b_method", 2) ... route[SIPOUT] { if (uri==myself) return; append_hf("P-hint: outbound\r\n"); append_branch(); append_branch(); route(RELAY); exit; } onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { xlog("L_INFO","Received $rs (IP:$si:$sp)\n"); if(status=~"18[03]"){ t_cancel_branches("others"); xlog("L_INFO","cancelled all other branches\n"); } route(NATMANAGE); } } ... But I see kamailio does not instantly send CANCEL to other branches after it has received 180/180 from any branch. Kamailio is sending CANCEL to other branches after they start sending 180/183 one by one. I want to cancel other brances instantly as soon as i get reply from any other branch. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/909

3 4

[kamailio/kamailio] tm: add support for dropping messages in local-request event route (#2147)
by Federico Cabiddu 25 Nov '19

25 Nov '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Currently it is not possible to drop a local generated message in tm:local-request event route because there is no context associated when running the event route. With this PR I tried to solve this introducing a new returned error (E_DROP) and a context into t_run_local_req. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2147 -- Commit Summary -- * tm: add support for dropping messages in local-request event route -- File Changes -- M src/core/error.h (1) M src/modules/tm/uac.c (36) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2147.patch https://github.com/kamailio/kamailio/pull/2147.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2147

3 11

git:master:7966f102: Merge pull request #2147 from kamailio/grumvalski/local_request_drop
by GitHub 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 7966f10292cb3c0d0c1ccda20c8475822b4e0993 URL: https://github.com/kamailio/kamailio/commit/7966f10292cb3c0d0c1ccda20c84758… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-11-25T19:29:21+01:00 Merge pull request #2147 from kamailio/grumvalski/local_request_drop tm: add support for dropping messages in local-request event route --- Modified: src/core/error.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7966f10292cb3c0d0c1ccda20c84758… Patch: https://github.com/kamailio/kamailio/commit/7966f10292cb3c0d0c1ccda20c84758… --- diff --git a/src/core/error.h b/src/core/error.h index 829073e555..8ac763bf2d 100644 --- a/src/core/error.h +++ b/src/core/error.h @@ -48,6 +48,7 @@ #define E_Q_EMPTY -16 /* Empty q */ #define E_Q_TOO_BIG -17 /* q too big (> 1) */ #define E_Q_DEC_MISSING -18 /* Decimal part missing */ +#define E_DROP -19 /* Dropped in script */ diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 1478853d3d..1112d7758c 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -239,6 +239,8 @@ static inline int t_run_local_req( msg_ctx_id_t backup_ctxid; int refresh_shortcuts = 0; sr_kemi_eng_t *keng = NULL; + run_act_ctx_t ra_ctx; + run_act_ctx_t *bctx; str evname = str_init("tm:local-request"); LM_DBG("executing event_route[tm:local-request]\n"); @@ -271,18 +273,24 @@ static inline int t_run_local_req( tm_global_ctx_id.msgid=lreq.id; tm_global_ctx_id.pid=lreq.pid; set_t(new_cell, T_BR_UNDEFINED); + + init_run_actions_ctx(&ra_ctx); + if(goto_on_local_req>=0) { - run_top_route(event_rt.rlist[goto_on_local_req], &lreq, 0); + run_top_route(event_rt.rlist[goto_on_local_req], &lreq, &ra_ctx); } else { keng = sr_kemi_eng_get(); if(keng==NULL) { LM_WARN("event callback (%s) set, but no cfg engine\n", tm_event_callback.s); } else { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ra_ctx); if(sr_kemi_route(keng, &lreq, EVENT_ROUTE, &tm_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); } + sr_kemi_act_ctx_set(bctx); } } /* restore original environment */ @@ -296,6 +304,12 @@ static inline int t_run_local_req( tm_xdata_swap(new_cell, &backup_xd, 1); setsflagsval(sflag_bk); + if (unlikely(ra_ctx.run_flags&DROP_R_F)) { + LM_DBG("tm:local-request dropped msg. to %.*s\n", + lreq.dst_uri.len, lreq.dst_uri.s); + refresh_shortcuts = E_DROP; + goto clean; + } /* rebuild the new message content */ if(lreq.force_send_socket != uac_r->dialog->send_sock) { LM_DBG("Send socket updated to: %.*s", @@ -350,6 +364,7 @@ static inline int t_run_local_req( } } +clean: /* clean local msg structure */ if (unlikely(lreq.new_uri.s)) { @@ -514,6 +529,10 @@ static inline int t_uac_prepare(uac_req_t *uac_r, #ifdef WITH_EVENT_LOCAL_REQUEST if (unlikely(goto_on_local_req>=0 || tm_event_callback.len>0)) { refresh_shortcuts = t_run_local_req(&buf, &buf_len, uac_r, new_cell, request); + if (unlikely(refresh_shortcuts==E_DROP)) { + ret=E_DROP; + goto error1; + } } #endif @@ -605,6 +624,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, int prepare_req_within(uac_req_t *uac_r, struct retr_buf **dst_req) { + int ret = -1; if (!uac_r || !uac_r->method || !uac_r->dialog) { LM_ERR("Invalid parameter value\n"); goto err; @@ -619,13 +639,17 @@ int prepare_req_within(uac_req_t *uac_r, if ((uac_r->method->len == 6) && (!memcmp("CANCEL", uac_r->method->s, 6))) goto send; uac_r->dialog->loc_seq.value++; /* Increment CSeq */ send: - return t_uac_prepare(uac_r, dst_req, 0); + ret = t_uac_prepare(uac_r, dst_req, 0); + + if (unlikely(ret < 0 && ret == E_DROP)) { + ret = 0; + } err: /* if (cbp) shm_free(cbp); */ /* !! never free cbp here because if t_uac_prepare fails, cbp is not freed * and thus caller has no chance to discover if it is freed or not !! */ - return -1; + return ret; } static inline int send_prepared_request_impl(struct retr_buf *request, int retransmit, int branch) @@ -711,7 +735,14 @@ int t_uac_with_ids(uac_req_t *uac_r, branch_bm_t added_branches = 1; ret = t_uac_prepare(uac_r, &request, &cell); - if (ret < 0) return ret; + + if (ret < 0) { + if (unlikely(ret == E_DROP)) { + ret = 0; + } + return ret; + } + is_ack = (uac_r->method->len == 3) && (memcmp("ACK", uac_r->method->s, 3)==0) ? 1 : 0; /* equivalent loop to the one in t_forward_nonack */

1 0

git:master:2ad60234: tm: initialize the context before running event route
by Federico Cabiddu 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 2ad6023432ae37b1709638ead2c77e1e4130678a URL: https://github.com/kamailio/kamailio/commit/2ad6023432ae37b1709638ead2c77e1… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-11-25T09:14:40+01:00 tm: initialize the context before running event route --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/2ad6023432ae37b1709638ead2c77e1… Patch: https://github.com/kamailio/kamailio/commit/2ad6023432ae37b1709638ead2c77e1… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 9af3da951a..1112d7758c 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -273,6 +273,9 @@ static inline int t_run_local_req( tm_global_ctx_id.msgid=lreq.id; tm_global_ctx_id.pid=lreq.pid; set_t(new_cell, T_BR_UNDEFINED); + + init_run_actions_ctx(&ra_ctx); + if(goto_on_local_req>=0) { run_top_route(event_rt.rlist[goto_on_local_req], &lreq, &ra_ctx); } else {

1 0

git:master:00f4147a: tm: add support for dropping messages in local-request event route
by Federico Cabiddu 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 00f4147a410990d3ebeeef8825329bbdff728d1a URL: https://github.com/kamailio/kamailio/commit/00f4147a410990d3ebeeef8825329bb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-11-25T08:51:30+01:00 tm: add support for dropping messages in local-request event route --- Modified: src/core/error.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/00f4147a410990d3ebeeef8825329bb… Patch: https://github.com/kamailio/kamailio/commit/00f4147a410990d3ebeeef8825329bb… --- diff --git a/src/core/error.h b/src/core/error.h index 829073e555..8ac763bf2d 100644 --- a/src/core/error.h +++ b/src/core/error.h @@ -48,6 +48,7 @@ #define E_Q_EMPTY -16 /* Empty q */ #define E_Q_TOO_BIG -17 /* q too big (> 1) */ #define E_Q_DEC_MISSING -18 /* Decimal part missing */ +#define E_DROP -19 /* Dropped in script */ diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 1478853d3d..9af3da951a 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -239,6 +239,8 @@ static inline int t_run_local_req( msg_ctx_id_t backup_ctxid; int refresh_shortcuts = 0; sr_kemi_eng_t *keng = NULL; + run_act_ctx_t ra_ctx; + run_act_ctx_t *bctx; str evname = str_init("tm:local-request"); LM_DBG("executing event_route[tm:local-request]\n"); @@ -272,17 +274,20 @@ static inline int t_run_local_req( tm_global_ctx_id.pid=lreq.pid; set_t(new_cell, T_BR_UNDEFINED); if(goto_on_local_req>=0) { - run_top_route(event_rt.rlist[goto_on_local_req], &lreq, 0); + run_top_route(event_rt.rlist[goto_on_local_req], &lreq, &ra_ctx); } else { keng = sr_kemi_eng_get(); if(keng==NULL) { LM_WARN("event callback (%s) set, but no cfg engine\n", tm_event_callback.s); } else { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ra_ctx); if(sr_kemi_route(keng, &lreq, EVENT_ROUTE, &tm_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); } + sr_kemi_act_ctx_set(bctx); } } /* restore original environment */ @@ -296,6 +301,12 @@ static inline int t_run_local_req( tm_xdata_swap(new_cell, &backup_xd, 1); setsflagsval(sflag_bk); + if (unlikely(ra_ctx.run_flags&DROP_R_F)) { + LM_DBG("tm:local-request dropped msg. to %.*s\n", + lreq.dst_uri.len, lreq.dst_uri.s); + refresh_shortcuts = E_DROP; + goto clean; + } /* rebuild the new message content */ if(lreq.force_send_socket != uac_r->dialog->send_sock) { LM_DBG("Send socket updated to: %.*s", @@ -350,6 +361,7 @@ static inline int t_run_local_req( } } +clean: /* clean local msg structure */ if (unlikely(lreq.new_uri.s)) { @@ -514,6 +526,10 @@ static inline int t_uac_prepare(uac_req_t *uac_r, #ifdef WITH_EVENT_LOCAL_REQUEST if (unlikely(goto_on_local_req>=0 || tm_event_callback.len>0)) { refresh_shortcuts = t_run_local_req(&buf, &buf_len, uac_r, new_cell, request); + if (unlikely(refresh_shortcuts==E_DROP)) { + ret=E_DROP; + goto error1; + } } #endif @@ -605,6 +621,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, int prepare_req_within(uac_req_t *uac_r, struct retr_buf **dst_req) { + int ret = -1; if (!uac_r || !uac_r->method || !uac_r->dialog) { LM_ERR("Invalid parameter value\n"); goto err; @@ -619,13 +636,17 @@ int prepare_req_within(uac_req_t *uac_r, if ((uac_r->method->len == 6) && (!memcmp("CANCEL", uac_r->method->s, 6))) goto send; uac_r->dialog->loc_seq.value++; /* Increment CSeq */ send: - return t_uac_prepare(uac_r, dst_req, 0); + ret = t_uac_prepare(uac_r, dst_req, 0); + + if (unlikely(ret < 0 && ret == E_DROP)) { + ret = 0; + } err: /* if (cbp) shm_free(cbp); */ /* !! never free cbp here because if t_uac_prepare fails, cbp is not freed * and thus caller has no chance to discover if it is freed or not !! */ - return -1; + return ret; } static inline int send_prepared_request_impl(struct retr_buf *request, int retransmit, int branch) @@ -711,7 +732,14 @@ int t_uac_with_ids(uac_req_t *uac_r, branch_bm_t added_branches = 1; ret = t_uac_prepare(uac_r, &request, &cell); - if (ret < 0) return ret; + + if (ret < 0) { + if (unlikely(ret == E_DROP)) { + ret = 0; + } + return ret; + } + is_ack = (uac_r->method->len == 3) && (memcmp("ACK", uac_r->method->s, 3)==0) ? 1 : 0; /* equivalent loop to the one in t_forward_nonack */

1 0

Kamailio developers meeting - follow up remarks
by Daniel-Constantin Mierla 25 Nov '19

25 Nov '19

Hello, last week we had the 2nd annual Kamailio Developers Meeting hosted by Sipgate in Dusseldorf, Germany: * https://www.kamailio.org/w/developers-meeting/ 16 people were at the event in various roles. Giacomo Vacca published on his blog a good summary of what happened there: * https://www.giacomovacca.com/2019/11/my-notes-on-kamailio-developer-meeting… This year we had a lot of discussions, as well as work done on multiple planes, not only Kamailio code. So I am trying to list here some of the conclusions for future development, the technical aspects of the meeting, so everyone is aware and can provide feedback. 1) Effective work was done on: * kamailio code * kamailio rpm packaging * kamailio tools (kamctl) * kamailio release process * kamailio project keys (to be used to sign the packages) 2) Documentation 2.a) Wiki * it was somehow a rough consensus to move the wiki content to github, along with changing the format from dokuwiki markdown to the standard/github markdown. This should enable people to make pull requests so developers or community members can review and aprove new content. It also makes it easier to contribute using existing github account, now the kamailio.org/wiki is requiring to make a dedicated account, which many prefer not to do it. * the presentation can be done either by using mkdocs to generate html files hosted on kamailio.org or using the github provided wiki portal. 2.b) Docs for variables and transformations * there was a proposal to move them in the documentation the modules that export them, there are pros and cons, needs more discussions. Now they are in the wiki, so this probably has to resume after deciding on 2.a). 3) Kamailio Modules 3.a) replication (dmq) - several participants discussed about negotiations between nodes to take active role on some cases (e.g., active dialogs) 3.b) api integration - quite some interest in JSON-based API routing, concluding in extending rtjson to cover more use cases 3.c) security - have options to restrict the use of TLS1.3 or newer 4) Kamailio Releases * v5.3.2 was released during the event, allowing to document the process * work to automatize the process is planned, then eventually assing teams for takeing cares of releases from specific branches 5) Kamailio Testing * existing docker-based testing framework should be extended and integrated in CD/CI pipeline 6) Kamailio packages 6.a) rpms * rpm.kamailio.org has been prepared and is expected to take over the opensuse build service for building rpms and hosting them. Expected to provide support for hosting many kamailio versions in the same release series so one can do downgrade to older releases. Also, there is work in progress to provide nightly builds. 6.b) debs * work is planned to offer many kamailio versions in the same release series 7) Kamailio tools * kamctl/kamdbctl should be obsoleted in favor of kamcli, which offers a better framework for input validation and output formatting, as well as better portability, no longer depending on shell interpreter 8) Various discussions * kemi exports from C point of view and how to combine the documentation for modules and their kemi exports * how to make kamaiio friendlier in virtualized environments (ended up in the need of making the use of advertised address a bit more dynamic) * project organizatoric topics - to be approached separately * next events - Fosdem - someone should submit a proposal to present about Kamailio 9) Long term goals We speak here more or less about Kamailio 6.0 ... * change the behaviour of the native config interpreter to be consistent with the other programming languages in terms of handling the response code (change what is now: the evaluation of negative value to false and positive value to true and the hidden return 0 to exit) * make the pool of processes more generic, so they can handle traffic from more sockets (being sip traffic or something else) -- this should make better use of resources, as some sockets might be less busy that others I hope I covered the important topics, if I remember something else, I will reply on this thread. Or maybe other participants can contribute missing topics. Should anyone have comments or suggestions on the above topics, or new ones, let's discuss on sr-users because it impacts the long term use of Kamailio (sr-dev is cc-ed now for notification purposes). Overall, there were 2 very intensive days, however in a friendly and relaxed environment offered by Sipgate. Extremely useful discussions, not only about Kamailio, but about RTC ecosystem. At the evening social network event event, a couple of external people joined, some of them presenting very interesting use cases of Kamailio. Many thanks to all participants that allocated time and resources to come to Dusseldorf, as well as to the companies that covered expenses for participants. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - April 27-29, 2020, in Berlin -- www.kamailioworld.com

1 1

git:master:d48ae799: app_lua_sr: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: d48ae7995374ee4be01cdd28b4f65706a04b620c URL: https://github.com/kamailio/kamailio/commit/d48ae7995374ee4be01cdd28b4f6570… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-25T12:02:01+01:00 app_lua_sr: use snprintf() instead of sprintf() --- Modified: src/modules/app_lua_sr/app_lua_sr_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/d48ae7995374ee4be01cdd28b4f6570… Patch: https://github.com/kamailio/kamailio/commit/d48ae7995374ee4be01cdd28b4f6570… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_exp.c b/src/modules/app_lua_sr/app_lua_sr_exp.c index 7218b206f2..3dab788436 100644 --- a/src/modules/app_lua_sr/app_lua_sr_exp.c +++ b/src/modules/app_lua_sr/app_lua_sr_exp.c @@ -655,7 +655,7 @@ static int lua_sr_tm_t_on_branch_failure(lua_State *L) } rt_name.len = rt_name_len; } - sprintf(rt_name.s, "%s:%s", BRANCH_FAILURE_ROUTE_PREFIX, name); + snprintf(rt_name.s, rt_name_len+1, "%s:%s", BRANCH_FAILURE_ROUTE_PREFIX, name); i = route_get(&event_rt, rt_name.s); if(i < 0 || event_rt.rlist[i]==0)

1 0

git:master:f39f7320: tm: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: f39f73204d53312612ef2c3d3cec9c2fd51532c7 URL: https://github.com/kamailio/kamailio/commit/f39f73204d53312612ef2c3d3cec9c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-25T11:54:36+01:00 tm: use snprintf() instead of sprintf() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/f39f73204d53312612ef2c3d3cec9c2… Patch: https://github.com/kamailio/kamailio/commit/f39f73204d53312612ef2c3d3cec9c2… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 6cbdaf1776..ba6fc82c74 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -538,21 +538,27 @@ static int fixup_on_failure(void** param, int param_no) static int fixup_on_branch_failure(void** param, int param_no) { char *full_route_name = NULL; - int len; + int blen =0; + int bsize = 0; int ret = 0; - if (param_no==1){ - if((len = strlen((char*)*param))<=1 - && (*(char*)(*param)==0 || *(char*)(*param)=='0')) { + if (param_no==1) { + bsize = strlen((char*)*param); + if((bsize <=1) && (*(char*)(*param)==0 || *(char*)(*param)=='0')) { *param = (void*)0; return 0; } - len += strlen(BRANCH_FAILURE_ROUTE_PREFIX) + 1; - if ((full_route_name = pkg_malloc(len+1)) == NULL) - { + bsize += strlen(BRANCH_FAILURE_ROUTE_PREFIX) + 2; + if ((full_route_name = pkg_malloc(bsize)) == NULL) { LM_ERR("No memory left in branch_failure fixup\n"); return -1; } - sprintf(full_route_name, "%s:%s", BRANCH_FAILURE_ROUTE_PREFIX, (char*)*param); + blen = snprintf(full_route_name, bsize, "%s:%s", + BRANCH_FAILURE_ROUTE_PREFIX, (char*)*param); + if(blen<0 || blen>=bsize) { + LM_ERR("Failure to construct route block name\n"); + pkg_free(full_route_name); + return -1; + } *param=(void*)full_route_name; ret = fixup_routes("t_on_branch_failure", &event_rt, param); pkg_free(full_route_name);

1 0

git:master:7be06d44: pike: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 7be06d444a0ca295e53efadb093f07e19a18cea8 URL: https://github.com/kamailio/kamailio/commit/7be06d444a0ca295e53efadb093f07e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-25T11:29:16+01:00 pike: use snprintf() instead of sprintf() --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/7be06d444a0ca295e53efadb093f07e… Patch: https://github.com/kamailio/kamailio/commit/7be06d444a0ca295e53efadb093f07e… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index 662f26a5de..62d23b0fc3 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -41,22 +41,28 @@ char *pike_top_print_addr( unsigned char *ip, int iplen, char *buff, int buffsize ) { unsigned short *ipv6_ptr = (unsigned short *)ip; - memset(buff, 0, PIKE_BUFF_SIZE*sizeof(char)); + int bsize; + int blen; + + bsize = PIKE_BUFF_SIZE*sizeof(char); + memset(buff, 0, bsize); DBG("pike:top:print_addr(iplen: %d, buffsize: %d)", iplen, buffsize); if ( iplen == 4 ) { inet_ntop(AF_INET, ip, buff, buffsize); - } - else if ( iplen == 16 ) { + } else if ( iplen == 16 ) { inet_ntop(AF_INET6, ip, buff, buffsize); - } - else { - sprintf( buff, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", + } else { + blen = snprintf(buff, bsize, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", htons(ipv6_ptr[0]), htons(ipv6_ptr[1]), htons(ipv6_ptr[2]), htons(ipv6_ptr[3]), htons(ipv6_ptr[4]), htons(ipv6_ptr[5]), htons(ipv6_ptr[6]), htons(ipv6_ptr[7])); + if(blen < 0 || blen >= bsize) { + LM_ERR("failed to print the address - reset it\n"); + memset(buff, 0, bsize); + } } return buff;

1 0

git:master:dadbc0cf: sl: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: dadbc0cf4a3a198e7a3791d830ed2cd5ffa8bfdd URL: https://github.com/kamailio/kamailio/commit/dadbc0cf4a3a198e7a3791d830ed2cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-25T11:21:08+01:00 sl: use snprintf() instead of sprintf() --- Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/dadbc0cf4a3a198e7a3791d830ed2cd… Patch: https://github.com/kamailio/kamailio/commit/dadbc0cf4a3a198e7a3791d830ed2cd… --- diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 3c74955e7e..c832f4fb09 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -237,6 +237,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) struct cseq_body *cseqb; char *tmp2; int len; + int tsize; if ((hf = (hdr_field_t*) pkg_malloc(sizeof(struct hdr_field))) == NULL) { @@ -251,8 +252,9 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) goto event_route_error; } - if ((tmp = (char *) pkg_malloc(sizeof(char) - * (msg->first_line.u.request.method.len + 5))) == NULL) + tsize = sizeof(char) + * (msg->first_line.u.request.method.len + 5); + if ((tmp = (char *) pkg_malloc(tsize)) == NULL) { LM_ERR("out of package memory\n"); pkg_free(cseqb); @@ -263,9 +265,16 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) memset(hf, 0, sizeof(struct hdr_field)); memset(cseqb, 0, sizeof(struct cseq_body)); - len = sprintf(tmp, "0 %.*s\r\n", + len = snprintf(tmp, tsize, "0 %.*s\r\n", msg->first_line.u.request.method.len, msg->first_line.u.request.method.s); + if(len<0 || len>tsize) { + LM_ERR("failed to print the tmp cseq\n"); + pkg_free(tmp); + pkg_free(cseqb); + pkg_free(hf); + goto event_route_error; + } tmp2 = parse_cseq(tmp, &tmp[len], cseqb); hf->type = HDR_CSEQ_T;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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 November 2019