Module: kamailio
Branch: master
Commit: b28ef4aabf78d107e17ddaf01d080a4ad21dc965
URL: https://github.com/kamailio/kamailio/commit/b28ef4aabf78d107e17ddaf01d080a4…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-03-25T11:28:14+01:00
pkg: obs - removed old project name
---
Modified: pkg/kamailio/obs/kamailio.init
Modified: pkg/kamailio/obs/kamailio.service
---
Diff: https://github.com/kamailio/kamailio/commit/b28ef4aabf78d107e17ddaf01d080a4…
Patch: https://github.com/kamailio/kamailio/commit/b28ef4aabf78d107e17ddaf01d080a4…
---
diff --git a/pkg/kamailio/obs/kamailio.init b/pkg/kamailio/obs/kamailio.init
index b9802e9241..166a69ae0a 100644
--- a/pkg/kamailio/obs/kamailio.init
+++ b/pkg/kamailio/obs/kamailio.init
@@ -3,7 +3,7 @@
# Startup script for Kamailio
#
# chkconfig: 345 85 15
-# description: Kamailio (OpenSER) - the Open Source SIP Server
+# description: Kamailio - the Open Source SIP Server
#
# processname: kamailio
# pidfile: /run/kamailio.pid
@@ -12,8 +12,8 @@
### BEGIN INIT INFO
# Provides: kamailio
# Required-Start: $local_fs $network
-# Short-Description: Kamailio (OpenSER) - the Open Source SIP Server
-# Description: Kamailio (former OpenSER) is an Open Source SIP Server released
+# Short-Description: Kamailio - the Open Source SIP Server
+# Description: Kamailio is an Open Source SIP Server released
# under GPL, able to handle thousands of call setups per second.
### END INIT INFO
diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service
index c89df1a30a..14a2e58089 100644
--- a/pkg/kamailio/obs/kamailio.service
+++ b/pkg/kamailio/obs/kamailio.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Kamailio (OpenSER) - the Open Source SIP Server
+Description=Kamailio - the Open Source SIP Server
Wants=network-online.target
After=network-online.target
Module: kamailio
Branch: master
Commit: 300bcaa931aa0afe2265008d6c53f9b3793e70f0
URL: https://github.com/kamailio/kamailio/commit/300bcaa931aa0afe2265008d6c53f9b…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-03-25T11:11:32+01:00
rtp_media_server: replaced old project name in comments [skip ci]
---
Modified: src/modules/rtp_media_server/rtp_media_server.c
---
Diff: https://github.com/kamailio/kamailio/commit/300bcaa931aa0afe2265008d6c53f9b…
Patch: https://github.com/kamailio/kamailio/commit/300bcaa931aa0afe2265008d6c53f9b…
---
diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c
index 6a1fbca636..cb4939f840 100644
--- a/src/modules/rtp_media_server/rtp_media_server.c
+++ b/src/modules/rtp_media_server/rtp_media_server.c
@@ -161,8 +161,8 @@ static int fixup_rms_action_play(void **param, int param_no)
}
/**
- * @return 0 to continue to load the OpenSER, -1 to stop the loading
- * and abort OpenSER.
+ * @return 0 to continue to load Kamailio, -1 to stop the loading
+ * and abort Kamailio.
*/
static int mod_init(void)
{
@@ -199,7 +199,7 @@ static int mod_init(void)
}
/**
- * Called only once when OpenSER is shuting down to clean up module
+ * Called only once when Kamailio is shuting down to clean up module
* resources.
*/
static void mod_destroy()
@@ -339,7 +339,7 @@ static void rms_dialog_manage_loop()
* PROC_TCP_MAIN -4 TCP main process
* PROC_UNIXSOCK -5 Unix domain socket server processes
*
- * If this function returns a nonzero value the loading of OpenSER will
+ * If this function returns a nonzero value the loading of Kamailio will
* stop.
*/
static int child_init(int rank)
Module: kamailio
Branch: master
Commit: dfbd4e12d6c4b3c9664d58ffbc479de9ea68f03e
URL: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-03-24T17:42:26+01:00
lwsc: added inter-module api
- exported lwsc request function to send data to a ws target and proto,
then wait for response data for a specific time interval
---
Added: src/modules/lwsc/api.h
Modified: src/modules/lwsc/lwsc_mod.c
---
Diff: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de…
Patch: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de…
---
diff --git a/src/modules/lwsc/api.h b/src/modules/lwsc/api.h
new file mode 100644
index 0000000000..c76fb8c6b1
--- /dev/null
+++ b/src/modules/lwsc/api.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com)
+ *
+ * This file is part of Kamailio, a free SIP server.
+ *
+ * Kamailio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version
+ *
+ * Kamailio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @brief LWSC - API definitions
+ * @ingroup lwsc
+ * Module: @ref lwsc
+ */
+
+#ifndef _LWSC_API_H_
+#define _LWSC_API_H_
+
+#include "../../core/str.h"
+
+typedef int (*lwsc_api_request_f)(str *wsurl, str *wsproto, str *sdata,
+ str *rdata, int rtimeout);
+
+/**
+ * @brief Stateless (sl) API structure
+ */
+typedef struct lwsc_api {
+ lwsc_api_request_f request; /* send and receice data */
+} lwsc_api_t;
+
+typedef int (*bind_lwsc_f)(lwsc_api_t* api);
+
+/**
+ * @brief Load the LWSX API
+ */
+static inline int lwsc_load_api(lwsc_api_t *lwscb)
+{
+ bind_lwsc_f bindlwsc;
+
+ bindlwsc = (bind_lwsc_f)find_export("bind_lwsc", 0, 0);
+ if ( bindlwsc == 0) {
+ LM_ERR("cannot find bind_lwsc exported function\n");
+ return -1;
+ }
+ if (bindlwsc(lwscb)==-1)
+ {
+ LM_ERR("cannot bind lwsc api\n");
+ return -1;
+ }
+ return 0;
+}
+
+#endif
diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c
index 8e5e068bdd..ada873f215 100644
--- a/src/modules/lwsc/lwsc_mod.c
+++ b/src/modules/lwsc/lwsc_mod.c
@@ -36,12 +36,15 @@
#include "../../core/kemi.h"
#include "../../core/parser/parse_param.h"
+#include "api.h"
+
MODULE_VERSION
static int mod_init(void);
static int child_init(int);
static void mod_destroy(void);
+static int bind_lwsc(lwsc_api_t* api);
static int w_lwsc_request(sip_msg_t* msg, char* pwsurl, char* pdata);
static int w_lwsc_notify(sip_msg_t* msg, char* pwsurl, char* pdata);
@@ -57,6 +60,8 @@ static cmd_export_t cmds[]={
fixup_spve_all, 0, ANY_ROUTE},
{"lwsc_notify", (cmd_function)w_lwsc_notify, 2,
fixup_spve_all, 0, ANY_ROUTE},
+ {"bind_lwsc", (cmd_function)bind_lwsc, 0,
+ 0, 0, 0},
{0, 0, 0, 0, 0, 0}
};
@@ -759,6 +764,20 @@ static int lwsc_pv_parse_name(pv_spec_t *sp, str *in)
return 0;
}
+/**
+ * @brief bind functions to LWSC API structure
+ */
+static int bind_lwsc(lwsc_api_t* api)
+{
+ if (!api) {
+ LM_ERR("invalid parameter value\n");
+ return -1;
+ }
+ api->request = lwsc_api_request;
+
+ return 0;
+}
+
/**
*
*/
Hello,
compiling the latest version of Kamailio results in a warning for
mohqueue module:
CC (gcc) [M mohqueue.so] mohq_funcs.o
mohq_funcs.c:225:23: warning: incompatible pointer types passing
'tm_cell_t *' (aka 'struct cell *') to parameter of type 'struct sip_msg *'
[-Wincompatible-pointer-types]
if (ptm->t_release (ptcell) < 0)
I noticed you pushed some changes recently, likely the warning was
introduced by them, not noticing it before. Anyhow, it seems something
that should be reviewed and fixed, otherwise may result in a crash by
passing incorrect structure pointer.
Cheers,
Daniel
--
Daniel-Constantin Mierla -- www.asipto.comwww.twitter.com/miconda -- www.linkedin.com/in/miconda
Funding: https://www.paypal.me/dcmierla
Module: kamailio
Branch: master
Commit: 868ff72ad17573657ce19239a6f394cb117475c6
URL: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2021-03-24T10:31:18+01:00
modules: readme files regenerated - pv ... [skip ci]
---
Modified: src/modules/pv/README
---
Diff: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c…
Patch: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c…
---
diff --git a/src/modules/pv/README b/src/modules/pv/README
index 4aaa44c225..10698c1dd4 100644
--- a/src/modules/pv/README
+++ b/src/modules/pv/README
@@ -194,16 +194,16 @@ Chapter 1. Admin Guide
The value of the parameter has the format: _name_ '=' _type_ ':'
_value_
-
- Note: this is special useful for usage with KEMI scripts, the $shv(...)
- variables must be defined during Kamailio initialization in order to
- become available in all worker processes.
* _name_: shared variable name
* _type_: type of the value
+ “i”: integer value
+ “s”: string value
* _value_: value to be set
+ Note: this is special useful for usage with KEMI scripts, the $shv(...)
+ variables must be defined during Kamailio initialization in order to
+ become available in all worker processes.
+
Default value is “NULL”.
Example 1.1. shvset parameter usage
Module: kamailio
Branch: master
Commit: c959a3c5f5efa1158bd53a31476f33d080793928
URL: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-03-24T10:21:07+01:00
pv: docs - relocated shvset note outside of param definition details [skip ci]
---
Modified: src/modules/pv/doc/pv_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d…
Patch: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d…
---
diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml
index 5fbe706c8e..1c4c84e0fb 100644
--- a/src/modules/pv/doc/pv_admin.xml
+++ b/src/modules/pv/doc/pv_admin.xml
@@ -63,11 +63,6 @@
The value of the parameter has the format:
_name_ '=' _type_ ':' _value_
</para>
- <para>
- Note: this is special useful for usage with KEMI scripts, the $shv(...)
- variables must be defined during Kamailio initialization in order to
- become available in all worker processes.
- </para>
<itemizedlist>
<listitem><para>_name_: shared variable name</para></listitem>
@@ -81,6 +76,11 @@
<listitem><para>_value_: value to be set</para></listitem>
</itemizedlist>
<para>
+ Note: this is special useful for usage with KEMI scripts, the $shv(...)
+ variables must be defined during Kamailio initialization in order to
+ become available in all worker processes.
+ </para>
+ <para>
Default value is <quote>NULL</quote>.
</para>
<example>
Module: kamailio
Branch: master
Commit: fa136edab5e552ed7b9e01af602bc09c98afce35
URL: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2021-03-24T10:16:24+01:00
modules: readme files regenerated - pv ... [skip ci]
---
Modified: src/modules/pv/README
---
Diff: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09…
Patch: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09…
---
diff --git a/src/modules/pv/README b/src/modules/pv/README
index a6702afa12..4aaa44c225 100644
--- a/src/modules/pv/README
+++ b/src/modules/pv/README
@@ -189,11 +189,15 @@ Chapter 1. Admin Guide
3.1. shvset (string)
- Set the value of a shared variable ($shv(name)). The parameter can be
- set many times.
+ Set the initial value of a shared variable ($shv(name)). The parameter
+ can be set many times.
The value of the parameter has the format: _name_ '=' _type_ ':'
_value_
+
+ Note: this is special useful for usage with KEMI scripts, the $shv(...)
+ variables must be defined during Kamailio initialization in order to
+ become available in all worker processes.
* _name_: shared variable name
* _type_: type of the value
+ “i”: integer value
Module: kamailio
Branch: master
Commit: bcc6370cdc00f25ce3d0f29e168c20ca880dcda2
URL: https://github.com/kamailio/kamailio/commit/bcc6370cdc00f25ce3d0f29e168c20c…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-03-24T09:46:53+01:00
pv: docs - note about use of $shv() in kemi scripts for shvset param [skip ci]
---
Modified: src/modules/pv/doc/pv_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/bcc6370cdc00f25ce3d0f29e168c20c…
Patch: https://github.com/kamailio/kamailio/commit/bcc6370cdc00f25ce3d0f29e168c20c…
---
diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml
index 61df878c3a..5fbe706c8e 100644
--- a/src/modules/pv/doc/pv_admin.xml
+++ b/src/modules/pv/doc/pv_admin.xml
@@ -56,13 +56,18 @@
<section id="pv.p.shvset">
<title><varname>shvset</varname> (string)</title>
<para>
- Set the value of a shared variable ($shv(name)). The parameter
+ Set the initial value of a shared variable ($shv(name)). The parameter
can be set many times.
</para>
<para>
The value of the parameter has the format:
_name_ '=' _type_ ':' _value_
</para>
+ <para>
+ Note: this is special useful for usage with KEMI scripts, the $shv(...)
+ variables must be defined during Kamailio initialization in order to
+ become available in all worker processes.
+ </para>
<itemizedlist>
<listitem><para>_name_: shared variable name</para></listitem>
<!--
Kamailio Project uses GitHub Issues only for bugs in the code or feature requests. Please use this template only for bug reports.
If you have questions about using Kamailio or related to its configuration file, ask on sr-users mailing list:
* http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users
If you have questions about developing extensions to Kamailio or its existing C code, ask on sr-dev mailing list:
* http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Please try to fill this template as much as possible for any issue. It helps the developers to troubleshoot the issue.
If there is no content to be filled in a section, the entire section can be removed.
You can delete the comments from the template sections when filling.
You can delete next line and everything above before submitting (it is a comment).
-->
### Description
<!--
Explain what you did, what you expected to happen, and what actually happened.
-->
My English is not very good, please have a look patiently,sorry
In the useing FreeSwitch Press machine register to kamailio ,at over time change failure

-
### Troubleshooting
#### Reproduction
<!--
If the issue can be reproduced, describe how it can be done.
-->
#### Debugging Data
<!--
If you got a core dump, use gdb to extract troubleshooting data - full backtrace,
local variables and the list of the code at the issue location.
gdb /path/to/kamailio /path/to/corefile
bt full
info locals
list
If you are familiar with gdb, feel free to attach more of what you consider to
be relevant.
-->
```
(paste your debugging data here)
```
#### Log Messages
<!--
Check the syslog file and if there are relevant log messages printed by Kamailio, add them next, or attach to issue, or provide a link to download them (e.g., to a pastebin site).
-->
```
(paste your log messages here)
```
#### SIP Traffic
<!--
If the issue is exposed by processing specific SIP messages, grab them with ngrep or save in a pcap file, then add them next, or attach to issue, or provide a link to download them (e.g., to a pastebin site).
-->
```
(paste your sip traffic here)
```
### Possible Solutions
<!--
If you found a solution or workaround for the issue, describe it. Ideally, provide a pull request with a fix.
-->
### Additional Information
* **Kamailio Version** - output of `kamailio -v`
```
(paste your output here)
```
* **Operating System**:
<!--
Details about the operating system, the type: Linux (e.g.,: Debian 8.4, Ubuntu 16.04, CentOS 7.1, ...), MacOS, xBSD, Solaris, ...;
Kernel details (output of `uname -a`)
-->
```
(paste your output here)
```
--
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/issues/2688
Currently tls module has `ca_list` param that
`Sets the CA list file name. This file contains a list of all the trusted CAs certificates used when connecting to other SIP implementations. If a signature in a certificate chain belongs to one of the listed CAs, the verification of that certificate will succeed.`
This issue proposes adding a new tls param `ca_path`. Its value would be a directory that contains any number of CA certificate files thus making it unnecessary to cat these files to a single `ca_list` file.
Implementation could be based on SSL_CTX_set_default_verify_dir() OpenSSL API function.
--
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/issues/2682
```
CC (gcc) [M geoip.so] geoip_mod.o
LD (gcc) [M geoip.so] geoip.so
CC (gcc) [M gzcompress.so] gzcompress_mod.o
LD (gcc) [M gzcompress.so] gzcompress.so
CC (gcc) [M http_async_client.so] async_http.o
CC (gcc) [M http_async_client.so] http_multi.o
In file included from /usr/include/curl/curl.h:2251:0,
from http_multi.h:41,
from http_multi.c:35:
http_multi.c: In function 'init_http_multi':
http_multi.c:405:51: error: 'CURLPIPE_NOTHING' undeclared (first use in this function)
curl_multi_setopt(g->multi, CURLMOPT_PIPELINING, CURLPIPE_NOTHING);
^
http_multi.c:405:51: note: each undeclared identifier is reported only once for each function it appears in
make[2]: *** [http_multi.o] Error 1
make[1]: *** [modules] Error 1
make[1]: Leaving directory `/root/rpmbuild/BUILD/kamailio-5.5.0-dev4/src'
make: *** [every-module] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.vGqxsU (%build)
Bad exit status from /var/tmp/rpm-tmp.vGqxsU (%build) ```
--
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/issues/2687
- Calling function KSR.secsipid.secsipid_add_identity() has six parameters, is giving error 'too many parameters'
<!-- 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/2686
-- Commit Summary --
* app_lua: Fixed error 'too many parameters'
-- File Changes --
M src/modules/app_lua/app_lua_api.c (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2686.patchhttps://github.com/kamailio/kamailio/pull/2686.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/2686