sr-dev May 2016

sr-dev@lists.kamailio.org

28 participants
348 discussions

git:master:07707736: Merge pull request #608 from kamailio/NSQ/doc-update-contributors
by Emmanuel Schmidbauer 09 May '16

09 May '16

Module: kamailio Branch: master Commit: 0770773625c2197a0f94b7b31b593b714fc2d259 URL: https://github.com/kamailio/kamailio/commit/0770773625c2197a0f94b7b31b593b7… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-05-09T18:46:32-04:00 Merge pull request #608 from kamailio/NSQ/doc-update-contributors nsq: update comment to include recognition for 2600hz --- Modified: modules/nsq/nsq_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0770773625c2197a0f94b7b31b593b7… Patch: https://github.com/kamailio/kamailio/commit/0770773625c2197a0f94b7b31b593b7… --- diff --git a/modules/nsq/nsq_mod.c b/modules/nsq/nsq_mod.c index 3db563e..54d50b5 100644 --- a/modules/nsq/nsq_mod.c +++ b/modules/nsq/nsq_mod.c @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * This module was based on the Kazoo module created by 2600hz. + * Thank you to 2600hz and their brilliant VoIP developers. + * * History: * -------- * 2016-03 first version (Weave Communications)

1 0

git:master:688728fc: nsq: update comment to include recognition for 2600hz
by Emmanuel Schmidbauer 09 May '16

09 May '16

Module: kamailio Branch: master Commit: 688728fc8b70697afb9ae79503eefc6c6da34481 URL: https://github.com/kamailio/kamailio/commit/688728fc8b70697afb9ae79503eefc6… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-05-09T18:26:08-04:00 nsq: update comment to include recognition for 2600hz --- Modified: modules/nsq/nsq_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/688728fc8b70697afb9ae79503eefc6… Patch: https://github.com/kamailio/kamailio/commit/688728fc8b70697afb9ae79503eefc6… --- diff --git a/modules/nsq/nsq_mod.c b/modules/nsq/nsq_mod.c index 3db563e..54d50b5 100644 --- a/modules/nsq/nsq_mod.c +++ b/modules/nsq/nsq_mod.c @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * This module was based on the Kazoo module created by 2600hz. + * Thank you to 2600hz and their brilliant VoIP developers. + * * History: * -------- * 2016-03 first version (Weave Communications)

1 0

[kamailio/kamailio] nsq: update comment to include recognition for 2600hz (#608)
by Emmanuel Schmidbauer 09 May '16

09 May '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/608 -- Commit Summary -- * nsq: update comment to include recognition for 2600hz -- File Changes -- M modules/nsq/nsq_mod.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/608.patch https://github.com/kamailio/kamailio/pull/608.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/608

1 1

git:master:2584ba37: Merge pull request #607 from kamailio/NSQ/feature-MWI-Voice-Message
by Emmanuel Schmidbauer 09 May '16

09 May '16

Module: kamailio Branch: master Commit: 2584ba37b2d8c0aa42f83820dd6384c3ed9c3042 URL: https://github.com/kamailio/kamailio/commit/2584ba37b2d8c0aa42f83820dd6384c… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-05-09T16:53:51-04:00 Merge pull request #607 from kamailio/NSQ/feature-MWI-Voice-Message nsq: allow sending MWI-Voice-Message json for message details --- Modified: modules/nsq/defs.h Modified: modules/nsq/nsq_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/2584ba37b2d8c0aa42f83820dd6384c… Patch: https://github.com/kamailio/kamailio/commit/2584ba37b2d8c0aa42f83820dd6384c… --- diff --git a/modules/nsq/defs.h b/modules/nsq/defs.h index 7e75756..8c5060c 100644 --- a/modules/nsq/defs.h +++ b/modules/nsq/defs.h @@ -38,6 +38,7 @@ #define BLF_JSON_CONTACT "Contact" #define BLF_JSON_EVENT_PKG "Event-Package" #define MWI_JSON_WAITING "Messages-Waiting" +#define MWI_JSON_VOICE_MESSAGE "MWI-Voice-Message" #define MWI_JSON_NEW "Messages-New" #define MWI_JSON_SAVED "Messages-Saved" #define MWI_JSON_URGENT "Messages-Urgent" @@ -50,6 +51,7 @@ #define MWI_BODY_BUFFER_SIZE 2048 #define PRESENCE_BODY_BUFFER_SIZE 4096 +#define MWI_BODY_VOICE_MESSAGE "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s\r\n" #define MWI_BODY "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s/%.*s (%.*s/%.*s)\r\n" #define PRESENCE_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <presence xmlns=\"urn:ietf:params:xml:ns:pidf\" xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" xmlns:c=\"urn:ietf:params:xml:ns:pidf:cipid\" entity=\"%s\"> \ diff --git a/modules/nsq/nsq_pua.c b/modules/nsq/nsq_pua.c index 1fa8826..082f4af 100644 --- a/modules/nsq/nsq_pua.c +++ b/modules/nsq/nsq_pua.c @@ -277,7 +277,7 @@ int nsq_pua_publish_mwi_to_presentity(struct json_object *json_obj) { str from_realm = { 0, 0 }, to_realm = { 0, 0 }; str callid = { 0, 0 }, fromtag = { 0, 0 }, totag = { 0, 0 }; str mwi_user = { 0, 0 }, mwi_waiting = { 0, 0 }, - mwi_new = { 0, 0 }, mwi_saved = { 0, 0 }, + mwi_voice_message = { 0, 0 }, mwi_new = { 0, 0 }, mwi_saved = { 0, 0 }, mwi_urgent = { 0, 0 }, mwi_urgent_saved = { 0, 0 }, mwi_account = { 0, 0 }, mwi_body = { 0, 0 }; int expires = 0; @@ -301,6 +301,7 @@ int nsq_pua_publish_mwi_to_presentity(struct json_object *json_obj) { json_extract_field(MWI_JSON_TO, mwi_user); json_extract_field(MWI_JSON_WAITING, mwi_waiting); + json_extract_field(MWI_JSON_VOICE_MESSAGE, mwi_voice_message); json_extract_field(MWI_JSON_NEW, mwi_new); json_extract_field(MWI_JSON_SAVED, mwi_saved); json_extract_field(MWI_JSON_URGENT, mwi_urgent); @@ -314,10 +315,15 @@ int nsq_pua_publish_mwi_to_presentity(struct json_object *json_obj) { expires += (int)time(NULL); } - sprintf(body, MWI_BODY, mwi_waiting.len, mwi_waiting.s, - mwi_account.len, mwi_account.s, mwi_new.len, mwi_new.s, - mwi_saved.len, mwi_saved.s, mwi_urgent.len, mwi_urgent.s, - mwi_urgent_saved.len, mwi_urgent_saved.s); + if (mwi_voice_message.len > 0) { + sprintf(body, MWI_BODY_VOICE_MESSAGE, mwi_waiting.len, mwi_waiting.s, + mwi_account.len, mwi_account.s, mwi_voice_message.len, mwi_voice_message.s); + } else { + sprintf(body, MWI_BODY, mwi_waiting.len, mwi_waiting.s, + mwi_account.len, mwi_account.s, mwi_new.len, mwi_new.s, + mwi_saved.len, mwi_saved.s, mwi_urgent.len, mwi_urgent.s, + mwi_urgent_saved.len, mwi_urgent_saved.s); + } mwi_body.s = body; mwi_body.len = strlen(body);

1 0

git:master:45a4848b: nsq: allow sending MWI-Voice-Message json for message details
by Emmanuel Schmidbauer 09 May '16

09 May '16

Module: kamailio Branch: master Commit: 45a4848b0275be9aded61d2c0f3cc9908a2b2575 URL: https://github.com/kamailio/kamailio/commit/45a4848b0275be9aded61d2c0f3cc99… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-05-09T14:05:47-04:00 nsq: allow sending MWI-Voice-Message json for message details --- Modified: modules/nsq/defs.h Modified: modules/nsq/nsq_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/45a4848b0275be9aded61d2c0f3cc99… Patch: https://github.com/kamailio/kamailio/commit/45a4848b0275be9aded61d2c0f3cc99… --- diff --git a/modules/nsq/defs.h b/modules/nsq/defs.h index 7e75756..8c5060c 100644 --- a/modules/nsq/defs.h +++ b/modules/nsq/defs.h @@ -38,6 +38,7 @@ #define BLF_JSON_CONTACT "Contact" #define BLF_JSON_EVENT_PKG "Event-Package" #define MWI_JSON_WAITING "Messages-Waiting" +#define MWI_JSON_VOICE_MESSAGE "MWI-Voice-Message" #define MWI_JSON_NEW "Messages-New" #define MWI_JSON_SAVED "Messages-Saved" #define MWI_JSON_URGENT "Messages-Urgent" @@ -50,6 +51,7 @@ #define MWI_BODY_BUFFER_SIZE 2048 #define PRESENCE_BODY_BUFFER_SIZE 4096 +#define MWI_BODY_VOICE_MESSAGE "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s\r\n" #define MWI_BODY "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s/%.*s (%.*s/%.*s)\r\n" #define PRESENCE_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <presence xmlns=\"urn:ietf:params:xml:ns:pidf\" xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" xmlns:c=\"urn:ietf:params:xml:ns:pidf:cipid\" entity=\"%s\"> \ diff --git a/modules/nsq/nsq_pua.c b/modules/nsq/nsq_pua.c index 1fa8826..082f4af 100644 --- a/modules/nsq/nsq_pua.c +++ b/modules/nsq/nsq_pua.c @@ -277,7 +277,7 @@ int nsq_pua_publish_mwi_to_presentity(struct json_object *json_obj) { str from_realm = { 0, 0 }, to_realm = { 0, 0 }; str callid = { 0, 0 }, fromtag = { 0, 0 }, totag = { 0, 0 }; str mwi_user = { 0, 0 }, mwi_waiting = { 0, 0 }, - mwi_new = { 0, 0 }, mwi_saved = { 0, 0 }, + mwi_voice_message = { 0, 0 }, mwi_new = { 0, 0 }, mwi_saved = { 0, 0 }, mwi_urgent = { 0, 0 }, mwi_urgent_saved = { 0, 0 }, mwi_account = { 0, 0 }, mwi_body = { 0, 0 }; int expires = 0; @@ -301,6 +301,7 @@ int nsq_pua_publish_mwi_to_presentity(struct json_object *json_obj) { json_extract_field(MWI_JSON_TO, mwi_user); json_extract_field(MWI_JSON_WAITING, mwi_waiting); + json_extract_field(MWI_JSON_VOICE_MESSAGE, mwi_voice_message); json_extract_field(MWI_JSON_NEW, mwi_new); json_extract_field(MWI_JSON_SAVED, mwi_saved); json_extract_field(MWI_JSON_URGENT, mwi_urgent); @@ -314,10 +315,15 @@ int nsq_pua_publish_mwi_to_presentity(struct json_object *json_obj) { expires += (int)time(NULL); } - sprintf(body, MWI_BODY, mwi_waiting.len, mwi_waiting.s, - mwi_account.len, mwi_account.s, mwi_new.len, mwi_new.s, - mwi_saved.len, mwi_saved.s, mwi_urgent.len, mwi_urgent.s, - mwi_urgent_saved.len, mwi_urgent_saved.s); + if (mwi_voice_message.len > 0) { + sprintf(body, MWI_BODY_VOICE_MESSAGE, mwi_waiting.len, mwi_waiting.s, + mwi_account.len, mwi_account.s, mwi_voice_message.len, mwi_voice_message.s); + } else { + sprintf(body, MWI_BODY, mwi_waiting.len, mwi_waiting.s, + mwi_account.len, mwi_account.s, mwi_new.len, mwi_new.s, + mwi_saved.len, mwi_saved.s, mwi_urgent.len, mwi_urgent.s, + mwi_urgent_saved.len, mwi_urgent_saved.s); + } mwi_body.s = body; mwi_body.len = strlen(body);

1 0

[kamailio/kamailio] nsq: allow sending MWI-Voice-Message json for message details (#607)
by Emmanuel Schmidbauer 09 May '16

09 May '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/607 -- Commit Summary -- * nsq: allow sending MWI-Voice-Message json for message details -- File Changes -- M modules/nsq/defs.h (2) M modules/nsq/nsq_pua.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/607.patch https://github.com/kamailio/kamailio/pull/607.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/607

1 1

git: new commits in branch 4.4
by Daniel-Constantin Mierla 09 May '16

09 May '16

- URL: https://github.com/kamailio/kamailio/commit/e1b8cc38ba493f6de6a3c70519fb327… Author: Konstantin S. Vishnivetsky <voip-projects(a)vishnivetsky.ru> Date: 2016-05-09T21:28:31+02:00 pkg: added rpm spec file for Oracle Enterprise Linux 7 - includes adding shadow-utils dependency added to make %pre scriplet work properly - baed on PR #588 (cherry picked from commit b7ec49886264b52b15d22b80c1c74ac40a6fb314) - URL: https://github.com/kamailio/kamailio/commit/1851ba4c67c8bfa48ae5f65ccecee07… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-09T21:29:01+02:00 msilo Minor edits to the README - Move the database field definitions close to the table definition - Fix typos, rewrite some parts (cherry picked from commit ceccf4b9d178e895ae5972f2cddf28e3ef108910) - URL: https://github.com/kamailio/kamailio/commit/aa39e12bf63a325effa52eae924a946… Author: Jonas BÃ¶ttner <boettner(a)sipgate.de> Date: 2016-05-09T21:30:21+02:00 enum: single digit is valid in function enum_query - is_e164() returns true for a single digit (previously two digits) (cherry picked from commit 86ecdb2ec109af536efa70c2b0e4b93c4072e8b5) - URL: https://github.com/kamailio/kamailio/commit/c29e524283b50b74f61e704f0e32b86… Author: Jonas BÃ¶ttner <boettner(a)sipgate.de> Date: 2016-05-09T21:30:32+02:00 enum: print out malformed uri in enum_query() - previous error message did not show up the username part of r-uri. therefor debugging was difficult. (cherry picked from commit fd3c30f981d97622fb99f2122ce0bc950774edfb) - URL: https://github.com/kamailio/kamailio/commit/6f60780e3fa3d8314e77b9960c04a12… Author: Konstantin S. Vishnivetsky <voip-projects(a)vishnivetsky.ru> Date: 2016-05-09T21:30:45+02:00 pkg/rpm: added folders with rpm specs for oracle el6 and el7 (cherry picked from commit e72c7e068dd510a56033ce422343675aa0fdafe7) - URL: https://github.com/kamailio/kamailio/commit/2189d14f20cf52c4802baffc258ecd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:31:03+02:00 sdpops: removed svn $Id$ lines, coherent indentation and whitespacing - added license header text (cherry picked from commit c4299225989d9ccf47c18e50b0014025270c65c7) - URL: https://github.com/kamailio/kamailio/commit/f739c6d0a861fce1808a93e4660546c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:32:01+02:00 sdpops: safety check if sdp pointer is null inside sdp_get() (cherry picked from commit cd67fbb8ecb83944f458ec8a127adc14d5b38aeb) - URL: https://github.com/kamailio/kamailio/commit/b696390ac29225dd29bdeb1ec8fe016… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:33:11+02:00 cdp: don't lock anymore for session during shutdown callbacks - if sigterm killed a worker in a locked zone, results in a deadlock at shutdown. The cleanup is done by a sigle process, no other processes run, therefore no more race (cherry picked from commit f3f87ca550d44364e3c6cc1653970258fdffaa2c) - URL: https://github.com/kamailio/kamailio/commit/316925662a3be833693eba6a2895b41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:33:26+02:00 cdp: use the function to check if it is shutdown phase - global variable is not accessible directly, breaking the build - issue introduced with previous commit (cherry picked from commit e70283a0b6010e4a4c567a50b9008e0d7c1e27d5) - URL: https://github.com/kamailio/kamailio/commit/c5c4610fa293ce8afc15bd6cc04897e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:33:57+02:00 corex: add section ids to docs (cherry picked from commit cb41e0146a73d9c91b0c590d65094e300ef67933) - URL: https://github.com/kamailio/kamailio/commit/fdeba44e840616e08a2309eb3cf1517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:34:10+02:00 core: print tos value if socket option for it cannot be set - to help with GH #598 (cherry picked from commit 0118338d82e2471572990a1ea09593265161e4a4) - URL: https://github.com/kamailio/kamailio/commit/31b69ed11536e1dd7ce4baef25d2da9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:34:50+02:00 kazoo: added some docs for pua_mode param based on lists discussions (cherry picked from commit df30b8c7c6021d84f560a6fb7d82a11cd0e1b3d5) - URL: https://github.com/kamailio/kamailio/commit/e16a2373eeb7e9add61058bda3ab2d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:35:13+02:00 smsops: safety check for pkg malloc result - allocated the biggest possible size to simplify the checks (cherry picked from commit fd01e587ed115a21284d27d7f402d51dc6f8743a) - URL: https://github.com/kamailio/kamailio/commit/1fb9685ea83353a1d32edd7f94f3b4d… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2016-05-09T21:35:26+02:00 pkg/rpm: added missing modules to the SPEC file for CentOS 6 - cnxcc added as separate package - GH #597 (cherry picked from commit 35a861a89e946a771623001f36dc3d17117be602) - URL: https://github.com/kamailio/kamailio/commit/a2697207977e43784fe8eba632b7f88… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-05-09T21:39:32+02:00 updated SQL and docs (cherry picked from commit 76649e4bced09b45d5c470a696168929e1758111) - URL: https://github.com/kamailio/kamailio/commit/a588ced38ff3460469e0d46a31c5786… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-05-09T21:39:47+02:00 modules/sipcapture updated modparam description (cherry picked from commit 6e9f1c045ae827ea4f6bec8ab62187ec41788255) - URL: https://github.com/kamailio/kamailio/commit/a164d19bbe74720ac428a2efd607439… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T21:40:01+02:00 smsops: safety checks for pkg malloc in pv get handler (cherry picked from commit d4a2ba2ef4323b4306109ab5ecccd1368e8c5f82)

1 0

git:master:7769b15a: presence, pua_dialoginfo, rtpenging, tmx: regenerated the readme files
by Daniel-Constantin Mierla 09 May '16

09 May '16

Module: kamailio Branch: master Commit: 7769b15a7c4b9a5046dc0b9f573a08c8052787ba URL: https://github.com/kamailio/kamailio/commit/7769b15a7c4b9a5046dc0b9f573a08c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T13:35:27+02:00 presence, pua_dialoginfo, rtpenging, tmx: regenerated the readme files --- Modified: modules/presence/README Modified: modules/pua_dialoginfo/README Modified: modules/rtpengine/README Modified: modules/tmx/README --- Diff: https://github.com/kamailio/kamailio/commit/7769b15a7c4b9a5046dc0b9f573a08c… Patch: https://github.com/kamailio/kamailio/commit/7769b15a7c4b9a5046dc0b9f573a08c…

1 0

git:master:0b2be725: presence: fixed XML declaration allowed only at the start of the document
by Daniel-Constantin Mierla 09 May '16

09 May '16

Module: kamailio Branch: master Commit: 0b2be725a94101a8baa63cb6cb70301c8de162c8 URL: https://github.com/kamailio/kamailio/commit/0b2be725a94101a8baa63cb6cb70301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T13:35:00+02:00 presence: fixed XML declaration allowed only at the start of the document --- Modified: modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0b2be725a94101a8baa63cb6cb70301… Patch: https://github.com/kamailio/kamailio/commit/0b2be725a94101a8baa63cb6cb70301… --- diff --git a/modules/presence/doc/presence_admin.xml b/modules/presence/doc/presence_admin.xml index 28de860..7558955 100644 --- a/modules/presence/doc/presence_admin.xml +++ b/modules/presence/doc/presence_admin.xml @@ -1,4 +1,4 @@ - <?xml version="1.0" encoding='ISO-8859-1'?> +<?xml version="1.0" encoding='ISO-8859-1'?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

1 0

git:master:d4a2ba2e: smsops: safety checks for pkg malloc in pv get handler
by Daniel-Constantin Mierla 09 May '16

09 May '16

Module: kamailio Branch: master Commit: d4a2ba2ef4323b4306109ab5ecccd1368e8c5f82 URL: https://github.com/kamailio/kamailio/commit/d4a2ba2ef4323b4306109ab5ecccd13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-09T13:31:28+02:00 smsops: safety checks for pkg malloc in pv get handler --- Modified: modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/d4a2ba2ef4323b4306109ab5ecccd13… Patch: https://github.com/kamailio/kamailio/commit/d4a2ba2ef4323b4306109ab5ecccd13… --- diff --git a/modules/smsops/smsops_impl.c b/modules/smsops/smsops_impl.c index a772f93..9caf19f 100644 --- a/modules/smsops/smsops_impl.c +++ b/modules/smsops/smsops_impl.c @@ -603,7 +603,7 @@ int pv_get_sms(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { if (param==NULL) return -1; - + if (!rp_send_data) { rp_send_data = (sms_rp_data_t*)pkg_malloc(sizeof(struct _sms_rp_data)); if (!rp_send_data) { @@ -655,6 +655,10 @@ int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) return -1; } rp_send_data->originator.s = pkg_malloc(val->rs.len); + if(rp_send_data->originator.s==NULL) { + LM_ERR("no more pkg\n"); + return -1; + } rp_send_data->originator.len = val->rs.len; memcpy(rp_send_data->originator.s, val->rs.s, val->rs.len); break; @@ -671,6 +675,10 @@ int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) return -1; } rp_send_data->destination.s = pkg_malloc(val->rs.len); + if(rp_send_data->destination.s==NULL) { + LM_ERR("no more pkg\n"); + return -1; + } rp_send_data->destination.len = val->rs.len; memcpy(rp_send_data->destination.s, val->rs.s, val->rs.len); break; @@ -754,6 +762,10 @@ int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) return -1; } rp_send_data->pdu.payload.s = pkg_malloc(val->rs.len); + if(rp_send_data->pdu.payload.s==NULL) { + LM_ERR("no more pkg\n"); + return -1; + } rp_send_data->pdu.payload.len = val->rs.len; memcpy(rp_send_data->pdu.payload.s, val->rs.s, val->rs.len); break; @@ -770,6 +782,10 @@ int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) return -1; } rp_send_data->pdu.destination.s = pkg_malloc(val->rs.len); + if(rp_send_data->pdu.destination.s==NULL) { + LM_ERR("no more pkg\n"); + return -1; + } rp_send_data->pdu.destination.len = val->rs.len; memcpy(rp_send_data->pdu.destination.s, val->rs.s, val->rs.len); break; @@ -786,6 +802,10 @@ int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) return -1; } rp_send_data->pdu.originating_address.s = pkg_malloc(val->rs.len); + if(rp_send_data->pdu.originating_address.s==NULL) { + LM_ERR("no more pkg\n"); + return -1; + } rp_send_data->pdu.originating_address.len = val->rs.len; memcpy(rp_send_data->pdu.originating_address.s, val->rs.s, val->rs.len); break;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2016