sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
285 discussions

git:master:fa3cf27a: pua_dialoginfo: Determine dialog event types in mod_init

by Henning Westerholt

Module: kamailio Branch: master Commit: fa3cf27abf1f76ef90941f47ef81adef4ffae68e URL: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-02T16:42:35+02:00 pua_dialoginfo: Determine dialog event types in mod_init Determine dialog event types for dialog callback on module initialization, since these will not change. --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… Patch: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 7b27e666c5..2dae4d449b 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -101,6 +101,7 @@ int disable_callee_publish_flag = DEF_DISABLE_CALLEE_PUBLISH_FLAG; char * pubruri_caller_avp = DEF_PUBRURI_CALLER_AVP; char * pubruri_callee_avp = DEF_PUBRURI_CALLEE_AVP; int publish_dialog_req_within = DEF_PUBLISH_DIALOG_REQ_WITHIN; +int dialog_event_types = DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED | DLGCB_EXPIRED | DLGCB_EARLY; int puadinfo_attribute_display = 0; @@ -622,25 +623,12 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } /* register dialog callbacks which triggers sending PUBLISH */ - if (publish_dialog_req_within) { - if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED - | DLGCB_EXPIRED | DLGCB_REQ_WITHIN | DLGCB_EARLY, - __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { - LM_ERR("cannot register callback for interesting dialog types\n"); - free_dlginfo_cell(dlginfo); - return NULL; - } - } else { - if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED - | DLGCB_EXPIRED | DLGCB_EARLY, - __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { - LM_ERR("cannot register callback for interesting dialog types\n"); - free_dlginfo_cell(dlginfo); - return NULL; - } - } + if (dlg_api.register_dlgcb(dlg, dialog_event_types, + __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { + LM_ERR("cannot register callback for interesting dialog types\n"); + free_dlginfo_cell(dlginfo); + return NULL; + } #ifdef PUA_DIALOGINFO_DEBUG /* dialog callback testing (registered last to be executed first) */ @@ -856,6 +844,9 @@ static int mod_init(void) LM_DBG("configured to use headers for uri values\n"); } + if(publish_dialog_req_within) + dialog_event_types |= DLGCB_REQ_WITHIN; + return 0; }

2 years, 7 months

[kamailio/kamailio] core/crypto: fix several mismatched bound warnings (PR #3098)

by Ovidiu Sas

#### Pre-Submission Checklist    - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fix for the following compiler warnings: ``` core/crypto/sha256.c:548:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 548 | void sr_SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:86:22: note: previously declared as ‘uint8_t[32]’ {aka ‘unsigned char[32]’} 86 | void sr_SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:611:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 611 | char *sr_SHA256_End(SHA256_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:87:34: note: previously declared as ‘char[65]’ 87 | char* sr_SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:911:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 911 | void sr_SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:98:22: note: previously declared as ‘uint8_t[64]’ {aka ‘unsigned char[64]’} 98 | void sr_SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:940:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 940 | char *sr_SHA512_End(SHA512_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:99:34: note: previously declared as ‘char[129]’ 99 | char* sr_SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:986:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 986 | void sr_SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:92:22: note: previously declared as ‘uint8_t[48]’ {aka ‘unsigned char[48]’} 92 | void sr_SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:1015:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 1015 | char *sr_SHA384_End(SHA384_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:93:34: note: previously declared as ‘char[97]’ 93 | char* sr_SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3098 -- Commit Summary -- * core/crypto: fix several mismatched bound warnings -- File Changes -- M src/core/crypto/sha256.c (16) M src/core/crypto/sha256.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3098.patch https://github.com/kamailio/kamailio/pull/3098.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3098 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3098(a)github.com>

2 years, 7 months

git:master:b4daf059: core/crypto: fix several mismatched bound warnings

by Henning Westerholt

Module: kamailio Branch: master Commit: b4daf05991f5fd5faae0defcf8802b650d6a4d24 URL: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-02T16:42:21+02:00 core/crypto: fix several mismatched bound warnings --- Modified: src/core/crypto/sha256.c Modified: src/core/crypto/sha256.h --- Diff: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6… Patch: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6…

2 years, 7 months

git:master:47169b67: cdp: use same data type for size computing as pointer type

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47169b6774759131e9e535f2b9d358772b777b9c URL: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-01T16:28:41+02:00 cdp: use same data type for size computing as pointer type --- Modified: src/modules/cdp/acceptor.c --- Diff: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… Patch: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… --- diff --git a/src/modules/cdp/acceptor.c b/src/modules/cdp/acceptor.c index 003f531fe2..4821ddd38e 100644 --- a/src/modules/cdp/acceptor.c +++ b/src/modules/cdp/acceptor.c @@ -79,12 +79,12 @@ void acceptor_process(dp_config *cfg) unsigned int sock; LM_INFO("Acceptor process starting up...\n"); - listening_socks = pkg_malloc((cfg->acceptors_cnt+1)*sizeof(int)); + listening_socks = pkg_malloc((cfg->acceptors_cnt+1)*sizeof(unsigned int)); if (!listening_socks){ - LOG_NO_MEM("pkg",(cfg->acceptors_cnt+1)*sizeof(int)); + LOG_NO_MEM("pkg",(cfg->acceptors_cnt+1)*sizeof(unsigned int)); goto done; } - memset(listening_socks,0,(cfg->acceptors_cnt+1)*sizeof(int)); + memset(listening_socks,0,(cfg->acceptors_cnt+1)*sizeof(unsigned int)); k=0; for(i=0;i<cfg->acceptors_cnt;i++) if (create_socket(cfg->acceptors[i].port,cfg->acceptors[i].bind,&sock)){

2 years, 7 months

git:master:3de5a781: snmpstats: use same type as the pointer for sizeof

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3de5a781a3d0333352ab72c6b790f472f393df2b URL: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-30T17:21:42+02:00 snmpstats: use same type as the pointer for sizeof --- Modified: src/modules/snmpstats/snmpSIPContactTable.c --- Diff: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… Patch: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… --- diff --git a/src/modules/snmpstats/snmpSIPContactTable.c b/src/modules/snmpstats/snmpSIPContactTable.c index d23f8557ac..e953bae6a3 100644 --- a/src/modules/snmpstats/snmpSIPContactTable.c +++ b/src/modules/snmpstats/snmpSIPContactTable.c @@ -203,7 +203,7 @@ int createContactRow(int userIndex, int contactIndex, char *contactName, /* Fill in the rest of the rows columns */ theRow->kamailioSIPContactURI = - (unsigned char *)pkg_malloc((stringLength + 1) * sizeof(char)); + (unsigned char *)pkg_malloc((stringLength + 1) * sizeof(unsigned char)); if(theRow->kamailioSIPContactURI == NULL) { pkg_free(OIDIndex); free(theRow);

2 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022