Module: kamailio
Branch: master
Commit: 12f313c6c7c9b6a9c12d8ee2693cb955c16afe35
URL: https://github.com/kamailio/kamailio/commit/12f313c6c7c9b6a9c12d8ee2693cb95…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2017-12-22T08:55:51+01:00
sctp: note about using recent versions for libsctp and kernel
---
Modified: src/modules/sctp/doc/sctp_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/12f313c6c7c9b6a9c12d8ee2693cb95…
Patch: https://github.com/kamailio/kamailio/commit/12f313c6c7c9b6a9c12d8ee2693cb95…
---
diff --git a/src/modules/sctp/doc/sctp_admin.xml b/src/modules/sctp/doc/sctp_admin.xml
index f9a5683154..b6fa8c1cb8 100644
--- a/src/modules/sctp/doc/sctp_admin.xml
+++ b/src/modules/sctp/doc/sctp_admin.xml
@@ -10,9 +10,9 @@
<!-- Module User's Guide -->
<chapter>
-
+
<title>&adminguide;</title>
-
+
<section>
<title>Overview</title>
<para>
@@ -29,9 +29,13 @@
The core Makefile variable SCTP must be set to 1 (which is by default set
to 1 in Makefile.defs) and sources compiled with -DUSE_SCTP (automatically
set when SCTP=1). In other words, if core Makefiles are not changed and
- SCTP variable is not overwritten from command line, then the SCTP
+ SCTP variable is not overwritten from command line, then the SCTP
support in core is enabled.
</para>
+ <para>
+ Note: it is recommended to use recent versions of libsctp (>1.0.10)
+ and kernel (>4.0.0) when enabling SCTP transport.
+ </para>
</section>
<section>
Module: kamailio
Branch: master
Commit: b8fb6f9f453a7ab72ea578e8469ae88a831ca0e9
URL: https://github.com/kamailio/kamailio/commit/b8fb6f9f453a7ab72ea578e8469ae88…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2017-12-22T08:49:36+01:00
sctp: removed risky workaround for dealing with old libksctp versions
- writing over the size of field may have unexpected results
---
Modified: src/modules/sctp/sctp_server.c
---
Diff: https://github.com/kamailio/kamailio/commit/b8fb6f9f453a7ab72ea578e8469ae88…
Patch: https://github.com/kamailio/kamailio/commit/b8fb6f9f453a7ab72ea578e8469ae88…
---
diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c
index 4a8285c992..3efc126a06 100644
--- a/src/modules/sctp/sctp_server.c
+++ b/src/modules/sctp/sctp_server.c
@@ -766,28 +766,8 @@ static int sctp_init_sock_opt_common(int s, int af)
/* enable the SCTP_EVENTS */
#ifdef SCTP_EVENTS
if (setsockopt(s, IPPROTO_SCTP, SCTP_EVENTS, ev_s, sizeof(*ev_s))==-1){
- /* on linux the checks for the struct sctp_event_subscribe size
- are too strict, making certain lksctp/kernel combination
- unworkable => since we don't use the extra information
- (sctp_authentication_event) added in newer version, we can
- try with different sizes) */
-#ifdef __OS_linux
- /* 1. lksctp 1.0.9 with kernel < 2.6.26 -> kernel expects
- the structure without the authentication event member */
- if (setsockopt(s, IPPROTO_SCTP, SCTP_EVENTS, ev_s, sizeof(*ev_s)-1)==0)
- goto ev_success;
- /* 2. lksctp < 1.0.9? with kernel >= 2.6.26: the sctp.h structure
- does not have the authentication member, but the newer kernels
- check only for optlen > sizeof(...) => we should never reach
- this point. */
- /* 3. just to be foolproof if we reached this point, try
- with a bigger size before giving up (out of desperation) */
- if (setsockopt(s, IPPROTO_SCTP, SCTP_EVENTS, ev_s, sizeof(es))==0)
- goto ev_success;
-
-#endif
LOG(L_ERR, "ERROR: sctp_init_sock_opt_common: setsockopt: "
- "SCTP_EVENTS: %s\n", strerror(errno));
+ "SCTP_EVENTS: %s (%d)\n", strerror(errno), errno);
sctp_err++;
goto error; /* critical */
}
Deer sr-dev,
I fall into a problem when I'm debuging kamailio with epoll io solution. "tcp main process" crashed because of using outbound memory, which tcpconn pointer pointed to.
After analying, I suppose it's may because of epoll possible pitfalls of using an event cache. But I'm not pretty sure. Does kamailio code in io_wait.h/tcp_main.c have such way to avoid the epoll possible pitfalls of using an event cache?
Looking forward your reply and thank you very much.
Best Regards,
Yaoping Zheng
fix janssonrpc-c module name in description of package kamailio-extra-modules
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [ ] 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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1383
-- Commit Summary --
* pkg/kamailio/deb: fix module name in description [skip ci]
-- File Changes --
M pkg/kamailio/deb/debian/control (2)
M pkg/kamailio/deb/jessie/control (2)
M pkg/kamailio/deb/precise/control (2)
M pkg/kamailio/deb/sid/control (2)
M pkg/kamailio/deb/squeeze/control (2)
M pkg/kamailio/deb/stretch/control (2)
M pkg/kamailio/deb/trusty/control (2)
M pkg/kamailio/deb/wheezy/control (2)
M pkg/kamailio/deb/xenial/control (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1383.patchhttps://github.com/kamailio/kamailio/pull/1383.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/1383
(cherry picked from commit 72daa184111009a948634c660b5c53eff0826562)
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [ ] 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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1375
-- Commit Summary --
* pkg/kamailio/deb: add http_async to kamailio-extra-modules [skip ci]
-- File Changes --
M pkg/kamailio/deb/debian/control (2)
M pkg/kamailio/deb/debian/rules (2)
M pkg/kamailio/deb/jessie/control (2)
M pkg/kamailio/deb/jessie/rules (2)
M pkg/kamailio/deb/precise/control (2)
M pkg/kamailio/deb/precise/rules (2)
M pkg/kamailio/deb/sid/control (2)
M pkg/kamailio/deb/sid/rules (2)
M pkg/kamailio/deb/squeeze/control (2)
M pkg/kamailio/deb/squeeze/rules (2)
M pkg/kamailio/deb/stretch/control (2)
M pkg/kamailio/deb/stretch/rules (2)
M pkg/kamailio/deb/trusty/control (2)
M pkg/kamailio/deb/trusty/rules (2)
M pkg/kamailio/deb/wheezy/control (2)
M pkg/kamailio/deb/wheezy/rules (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1375.patchhttps://github.com/kamailio/kamailio/pull/1375.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/1375