sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
306 discussions

git:master:22f9e269: slack: remove error string from LM_ERR() logs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 22f9e269dd68edcb025e103d9aa1432423dd5550 URL: https://github.com/kamailio/kamailio/commit/22f9e269dd68edcb025e103d9aa1432… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:39:33+02:00 slack: remove error string from LM_ERR() logs - it is added automatically in the prefix - check return of snprintf() against <0, on some OSes the man pages list negative return code on error --- Modified: src/modules/slack/slack.c --- Diff: https://github.com/kamailio/kamailio/commit/22f9e269dd68edcb025e103d9aa1432… Patch: https://github.com/kamailio/kamailio/commit/22f9e269dd68edcb025e103d9aa1432… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index 906e824bee..7a046d387a 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -112,13 +112,13 @@ static int _curl_send(const char* uri, str *post_data) // LM_DBG("sending to[%s]\n", uri); datasz = snprintf(NULL, 0, BODY_FMT, slack_channel, slack_username, post_data->s, slack_icon); - if (datasz == -1) { - LM_ERR("Error: snprintf error in calculating buffer size\n"); + if (datasz < 0) { + LM_ERR("snprintf error in calculating buffer size\n"); return -1; } send_data = (char*)pkg_mallocxz((datasz+1)*sizeof(char)); if(send_data==NULL) { - LM_ERR("Error: can not allocate pkg memory [%d] bytes\n", datasz); + LM_ERR("can not allocate pkg memory [%d] bytes\n", datasz); return -1; } snprintf(send_data, datasz+1, BODY_FMT, slack_channel, slack_username, post_data->s, slack_icon); @@ -126,7 +126,7 @@ static int _curl_send(const char* uri, str *post_data) curl_global_init(CURL_GLOBAL_ALL); if((curl_handle=curl_easy_init())==NULL) { - LM_ERR("Error: Unable to init cURL library\n"); + LM_ERR("Unable to init cURL library\n"); curl_global_cleanup(); return -1; } @@ -271,7 +271,7 @@ static int ki_slack_send(sip_msg_t *msg, str *slmsg) return -1; } if(pv_printf_s(msg, xmodel, &txt)!=0) { - LM_ERR("Error: cannot eval reparsed value\n"); + LM_ERR("cannot eval reparsed value\n"); pv_elem_free_all(xmodel); return -1; }

3 years, 4 months

git:master:4d7490a2: Makefile.groups: added slack module to group utils

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4d7490a22256b2fdb376e2dd910ce0cc3728f0b8 URL: https://github.com/kamailio/kamailio/commit/4d7490a22256b2fdb376e2dd910ce0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:33:53+02:00 Makefile.groups: added slack module to group utils - where http_client module resides --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/4d7490a22256b2fdb376e2dd910ce0c… Patch: https://github.com/kamailio/kamailio/commit/4d7490a22256b2fdb376e2dd910ce0c… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index aa709375bc..62a585cafb 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -77,7 +77,7 @@ mod_list_xmpp=xmpp mod_list_berkeley=db_berkeley # - modules depending on curl library -mod_list_utils=utils http_client lost +mod_list_utils=utils http_client lost slack # - modules depending on curl and libevent2 library mod_list_http_async=http_async_client

3 years, 4 months

[kamailio/kamailio] slack: new module, send message to slack channel (#2838)

by Arsen Semenov

#### 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 this is a tiny module which provides integration with slack over webhooks. currently it exports only one function which accepts formatted string as an argument, evaluates pseudo-variables if any and sends the msg to slack channel (channel name, username and emoji are set as a module parameters). Kemi function is exported as well. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2838 -- Commit Summary -- * slack: new module, send message to slack channel -- File Changes -- A src/modules/slack/Makefile (31) A src/modules/slack/README (154) A src/modules/slack/doc/Makefile (4) A src/modules/slack/doc/slack.html (468) A src/modules/slack/doc/slack.xml (28) A src/modules/slack/doc/slack_admin.xml (175) A src/modules/slack/slack.c (298) A src/modules/slack/slack.h (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2838.patch https://github.com/kamailio/kamailio/pull/2838.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/2838

3 years, 4 months

git:master:d224cc5d: slack: allocate zeroed memory for send_data

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d224cc5da7858fb99db64ec26fe3bd8acb0cadfc URL: https://github.com/kamailio/kamailio/commit/d224cc5da7858fb99db64ec26fe3bd8… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:32:54+02:00 slack: allocate zeroed memory for send_data --- Modified: src/modules/slack/slack.c --- Diff: https://github.com/kamailio/kamailio/commit/d224cc5da7858fb99db64ec26fe3bd8… Patch: https://github.com/kamailio/kamailio/commit/d224cc5da7858fb99db64ec26fe3bd8… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index acb724861b..906e824bee 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -116,7 +116,7 @@ static int _curl_send(const char* uri, str *post_data) LM_ERR("Error: snprintf error in calculating buffer size\n"); return -1; } - send_data = (char*)pkg_malloc((datasz+1)*sizeof(char)); + send_data = (char*)pkg_mallocxz((datasz+1)*sizeof(char)); if(send_data==NULL) { LM_ERR("Error: can not allocate pkg memory [%d] bytes\n", datasz); return -1;

3 years, 4 months

git:master:62ac885b: slack: fix param typo; strncpy, snprintf error check; removed pre-built html doc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 62ac885b8b511c88f8bbddd5d791ba547a441374 URL: https://github.com/kamailio/kamailio/commit/62ac885b8b511c88f8bbddd5d791ba5… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:32:54+02:00 slack: fix param typo; strncpy, snprintf error check; removed pre-built html doc --- Modified: src/modules/slack/Makefile Modified: src/modules/slack/doc/slack_admin.xml Modified: src/modules/slack/slack.c Removed: src/modules/slack/doc/slack.html --- Diff: https://github.com/kamailio/kamailio/commit/62ac885b8b511c88f8bbddd5d791ba5… Patch: https://github.com/kamailio/kamailio/commit/62ac885b8b511c88f8bbddd5d791ba5…

3 years, 4 months

git:master:74cfb526: slack: new module, send message to slack channel

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 74cfb526ff035ab08ba13497e6657d656b690db0 URL: https://github.com/kamailio/kamailio/commit/74cfb526ff035ab08ba13497e6657d6… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:32:54+02:00 slack: new module, send message to slack channel --- Added: src/modules/slack/Makefile Added: src/modules/slack/README Added: src/modules/slack/doc/Makefile Added: src/modules/slack/doc/slack.html Added: src/modules/slack/doc/slack.xml Added: src/modules/slack/doc/slack_admin.xml Added: src/modules/slack/slack.c Added: src/modules/slack/slack.h --- Diff: https://github.com/kamailio/kamailio/commit/74cfb526ff035ab08ba13497e6657d6… Patch: https://github.com/kamailio/kamailio/commit/74cfb526ff035ab08ba13497e6657d6…

3 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021