sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

Contributing platform specific code to Kamailio

by Tsvetomir Dimitrov

Hello, I am working on a functionality which handles ipsec tunel creation for VoLTE registration and I'd like to contribute it to the project. However the code is heavily Linux specific - uses xfrm framework, so it won't compile on distribution with older kernels and definitely won't compile on *BSD. How problematic is this? How to handle this implementation so that it gets merged? Right now I can see two options: 1. Implement the functionality in ims_register_pcscf. 2. Implement separate ipsec module and handle the tunel creation/tear down from the configuration. The first solution is definitely the easiest one for implementation, but after my patch the module won't be as portable as it is now and I'm afraid my patch will be rejected. The second one separates the platform specific code in separate module and won't affect ims_register_pcscf. However I need data from ims_usrloc_pcscf, which is not accessible from the configuration. Also, writing separate module for a limited IPSEC handling seems like a overkill for me. What's your opinion? Best regards, Tsvetomir

6 years, 11 months

git:5.1:7f8a398d: modules/sipcapture fixed LM_ERR to LM_DBG

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 7f8a398dd18d240efd8eb4377251a8752b321a1e URL: https://github.com/kamailio/kamailio/commit/7f8a398dd18d240efd8eb4377251a87… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T12:16:00+01:00 modules/sipcapture fixed LM_ERR to LM_DBG (cherry picked from commit c2949fe2dc4d1156657cd6bc1683da83eda2a809) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/7f8a398dd18d240efd8eb4377251a87… Patch: https://github.com/kamailio/kamailio/commit/7f8a398dd18d240efd8eb4377251a87… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 171e1d035c..6e6faa1ad4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3030,7 +3030,7 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; - LM_ERR("REQUEST, PRE, %.*s\n", in->len, in->s); + LM_DBG("REQUEST, PRE, %.*s\n", in->len, in->s); switch(in->len) { case 5: {

6 years, 11 months

git:5.1:501fdfe9: sctp: removed unused goto label

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 501fdfe94211eb525d775738a2f6c77499033447 URL: https://github.com/kamailio/kamailio/commit/501fdfe94211eb525d775738a2f6c77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T12:15:13+01:00 sctp: removed unused goto label (cherry picked from commit f6232ee6d5d7fed67b6510c8c5ab8e7f6273274e) --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/501fdfe94211eb525d775738a2f6c77… Patch: https://github.com/kamailio/kamailio/commit/501fdfe94211eb525d775738a2f6c77… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 0e0b6eab97..66c71b7889 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -797,9 +797,6 @@ static int sctp_init_sock_opt_common(int s, int af) sctp_err++; goto error; /* critical */ } -#ifdef __OS_linux -ev_success: -#endif #else #error no sctp lib support for SCTP_EVENTS, consider upgrading #endif /* SCTP_EVENTS */

6 years, 11 months

git:master:f6232ee6: sctp: removed unused goto label

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f6232ee6d5d7fed67b6510c8c5ab8e7f6273274e URL: https://github.com/kamailio/kamailio/commit/f6232ee6d5d7fed67b6510c8c5ab8e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:57:05+01:00 sctp: removed unused goto label --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f6232ee6d5d7fed67b6510c8c5ab8e7… Patch: https://github.com/kamailio/kamailio/commit/f6232ee6d5d7fed67b6510c8c5ab8e7… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 0e0b6eab97..66c71b7889 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -797,9 +797,6 @@ static int sctp_init_sock_opt_common(int s, int af) sctp_err++; goto error; /* critical */ } -#ifdef __OS_linux -ev_success: -#endif #else #error no sctp lib support for SCTP_EVENTS, consider upgrading #endif /* SCTP_EVENTS */

6 years, 11 months

git:master:589e8a83: Merge pull request #1406 from adubovikov/master

by GitHub

Module: kamailio Branch: master Commit: 589e8a8345da5160c1693c1c6808be4588b625aa URL: https://github.com/kamailio/kamailio/commit/589e8a8345da5160c1693c1c6808be4… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-22T11:32:43+01:00 Merge pull request #1406 from adubovikov/master modules/sipcapture fixed LM_ERR to LM_DBG --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/589e8a8345da5160c1693c1c6808be4… Patch: https://github.com/kamailio/kamailio/commit/589e8a8345da5160c1693c1c6808be4… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 171e1d035c..6e6faa1ad4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3030,7 +3030,7 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; - LM_ERR("REQUEST, PRE, %.*s\n", in->len, in->s); + LM_DBG("REQUEST, PRE, %.*s\n", in->len, in->s); switch(in->len) { case 5: {

6 years, 11 months

git:master:c2949fe2: modules/sipcapture fixed LM_ERR to LM_DBG

by GitHub

Module: kamailio Branch: master Commit: c2949fe2dc4d1156657cd6bc1683da83eda2a809 URL: https://github.com/kamailio/kamailio/commit/c2949fe2dc4d1156657cd6bc1683da8… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-22T10:52:15+01:00 modules/sipcapture fixed LM_ERR to LM_DBG --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/c2949fe2dc4d1156657cd6bc1683da8… Patch: https://github.com/kamailio/kamailio/commit/c2949fe2dc4d1156657cd6bc1683da8… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 171e1d035c..6e6faa1ad4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3030,7 +3030,7 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; - LM_ERR("REQUEST, PRE, %.*s\n", in->len, in->s); + LM_DBG("REQUEST, PRE, %.*s\n", in->len, in->s); switch(in->len) { case 5: {

6 years, 11 months

[kamailio/kamailio] modules/sipcapture fixed LM_ERR to LM_DBG (#1406)

by Alexandr Dubovikov

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) #### Checklist:  - [x] PR should be backported to stable branches #### Description fixing LM_ERR logging to LM_DBG in the pv_parse_hep_name() function. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1406 -- Commit Summary -- * modules/sipcapture fixed LM_ERR to LM_DBG -- File Changes -- M src/modules/sipcapture/sipcapture.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1406.patch https://github.com/kamailio/kamailio/pull/1406.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/1406

6 years, 11 months

git:5.1:70bc83c5: siptrace: fixed unused variable warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 70bc83c52c6bfe38fd5daa60c3aa449521a063fa URL: https://github.com/kamailio/kamailio/commit/70bc83c52c6bfe38fd5daa60c3aa449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:27:19+01:00 siptrace: fixed unused variable warnings (cherry picked from commit 7dae4ec9e4be87d5a3406fe2ddeb98328beb1125) --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_send.h --- Diff: https://github.com/kamailio/kamailio/commit/70bc83c52c6bfe38fd5daa60c3aa449… Patch: https://github.com/kamailio/kamailio/commit/70bc83c52c6bfe38fd5daa60c3aa449… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 924c4f52e7..851bf6e0f8 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1016,7 +1016,6 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; sip_msg_t *msg; ip_addr_t to_ip; - int len; dest_info_t *dst; if(t == NULL || ps == NULL) { @@ -1334,7 +1333,6 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) siptrace_data_t sto; sip_msg_t *msg; ip_addr_t to_ip; - int len; char statusbuf[5]; if(slcbp == NULL || slcbp->req == NULL) { diff --git a/src/modules/siptrace/siptrace_send.h b/src/modules/siptrace/siptrace_send.h index 30c33e53b5..867d3995b0 100644 --- a/src/modules/siptrace/siptrace_send.h +++ b/src/modules/siptrace/siptrace_send.h @@ -68,8 +68,9 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2); #define siptrace_copy_proto(vproto, vbuf) do { \ int __olen; \ siptrace_copy_proto_olen(vproto, vbuf, __olen); \ + (void)__olen; \ } while(0) char* siptrace_proto_name(int vproto); -#endif \ No newline at end of file +#endif

6 years, 11 months

git:5.1:e9549e27: rls: removed local variable contact, unused inside rls_handle_subscribe()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: e9549e27efaf920e6f0b3d4c7a81129b705326e9 URL: https://github.com/kamailio/kamailio/commit/e9549e27efaf920e6f0b3d4c7a81129… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:26:32+01:00 rls: removed local variable contact, unused inside rls_handle_subscribe() (cherry picked from commit 2aebb2bf1f3d71a0dc7eca847af2aa127ff54453) --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/e9549e27efaf920e6f0b3d4c7a81129… Patch: https://github.com/kamailio/kamailio/commit/e9549e27efaf920e6f0b3d4c7a81129… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index 9222dc72b8..a96d1674f7 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -479,7 +479,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma pres_ev_t* event = NULL; int err_ret = -1; int ret = to_presence_code; - str* contact = NULL; xmlDocPtr doc = NULL; xmlNodePtr service_node = NULL; unsigned int hash_code=0; @@ -802,13 +801,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma ret = 1; stop: forpresence: - if(contact!=NULL) - { - if(contact->s!=NULL) - pkg_free(contact->s); - pkg_free(contact); - } - if(subs.pres_uri.s!=NULL) pkg_free(subs.pres_uri.s); if(subs.record_route.s!=NULL) @@ -829,13 +821,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma error: LM_ERR("occurred in rls_handle_subscribe\n"); - - if(contact!=NULL) - { - if(contact->s!=NULL) - pkg_free(contact->s); - pkg_free(contact); - } if(subs.pres_uri.s!=NULL) pkg_free(subs.pres_uri.s);

6 years, 11 months

git:5.1:730fad39: rls: rls_get_service_list() - set to NULL the content of rootdoc pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 730fad39599c39b1a5c3faa1d9bb9c49db61439b URL: https://github.com/kamailio/kamailio/commit/730fad39599c39b1a5c3faa1d9bb9c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:26:19+01:00 rls: rls_get_service_list() - set to NULL the content of rootdoc pointer - its a function parameter and expects to be set by the function (cherry picked from commit 5e58d48c980f5e413f47271dd342ee0630722bbb) --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/730fad39599c39b1a5c3faa1d9bb9c4… Patch: https://github.com/kamailio/kamailio/commit/730fad39599c39b1a5c3faa1d9bb9c4… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index c895bd1a93..9222dc72b8 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -272,12 +272,10 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, LM_DBG("service uri %.*s not found in rl document for user" " sip:%.*s@%.*s\n", service_uri->len, service_uri->s, user->len, user->s, domain->len, domain->s); - rootdoc = NULL; if(xmldoc!=NULL) xmlFreeDoc(xmldoc); - } - else - { + *rootdoc = NULL; + } else { *rootdoc = xmldoc; } @@ -290,8 +288,6 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, error: if(result!=NULL) rls_xcap_dbf.free_result(rls_xcap_db, result); - if(xmldoc!=NULL) - xmlFreeDoc(xmldoc); if(xcapdoc!=NULL) pkg_free(xcapdoc);

6 years, 11 months

← Newer
1
...
16
17
18
19
20
21
22
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018