Module: kamailio
Branch: master
Commit: 3e731300e54c1dd65a36b044ac05c9a31fc246be
URL: https://github.com/kamailio/kamailio/commit/3e731300e54c1dd65a36b044ac05c9a…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2019-01-22T09:01:54+01:00
modules: readme files regenerated - dialog ... [skip ci]
---
Modified: src/modules/dialog/README
---
Diff: https://github.com/kamailio/kamailio/commit/3e731300e54c1dd65a36b044ac05c9a…
Patch: https://github.com/kamailio/kamailio/commit/3e731300e54c1dd65a36b044ac05c9a…
---
diff --git a/src/modules/dialog/README b/src/modules/dialog/README
index 4e3f43e99b..f4bfe360ea 100644
--- a/src/modules/dialog/README
+++ b/src/modules/dialog/README
@@ -662,8 +662,8 @@ modparam("dialog", "default_timeout", 21600)
6.7. early_timeout (integer)
- The timeout (in seconds) after which the dialogs in early state (no
- final response received) are destroyed.
+ The timeout (in seconds) after which the dialogs in unconfirmed or
+ early state (no final response received) are destroyed.
Default value is “300 (5 minutes)”.
Module: kamailio
Branch: master
Commit: bdc4d3c7dea73e10353d37655f31d6e36c87126b
URL: https://github.com/kamailio/kamailio/commit/bdc4d3c7dea73e10353d37655f31d6e…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-22T08:46:39+01:00
dialog: docs - small addition to early_timeout param
---
Modified: src/modules/dialog/doc/dialog_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/bdc4d3c7dea73e10353d37655f31d6e…
Patch: https://github.com/kamailio/kamailio/commit/bdc4d3c7dea73e10353d37655f31d6e…
---
diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml
index 9adca735db..c74140e04e 100644
--- a/src/modules/dialog/doc/dialog_admin.xml
+++ b/src/modules/dialog/doc/dialog_admin.xml
@@ -323,8 +323,8 @@ modparam("dialog", "default_timeout", 21600)
<section id="dialog.p.early_timeout">
<title><varname>early_timeout</varname> (integer)</title>
<para>
- The timeout (in seconds) after which the dialogs in early state (no
- final response received) are destroyed.
+ The timeout (in seconds) after which the dialogs in unconfirmed or early
+ state (no final response received) are destroyed.
</para>
<para>
<emphasis>
Module: kamailio
Branch: master
Commit: c06aeea1b1c31720437037c211875bea8de0a669
URL: https://github.com/kamailio/kamailio/commit/c06aeea1b1c31720437037c211875be…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2019-01-21T23:27:43+01:00
db_mysql: remove long commented out DBG statement that don't work for all data
---
Modified: src/modules/db_mysql/km_dbase.c
---
Diff: https://github.com/kamailio/kamailio/commit/c06aeea1b1c31720437037c211875be…
Patch: https://github.com/kamailio/kamailio/commit/c06aeea1b1c31720437037c211875be…
---
diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c
index 84cb5030d8..3014d374f6 100644
--- a/src/modules/db_mysql/km_dbase.c
+++ b/src/modules/db_mysql/km_dbase.c
@@ -96,10 +96,6 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s)
CON_TIMESTAMP(_h) = t;
}
- /* screws up the terminal when the query contains a BLOB :-( (by bogdan)
- * LM_DBG("submit_query(): %.*s\n", _s->len, _s->s);
- */
-
/* When a server connection is lost and a query is attempted, most of
* the time the query will return a CR_SERVER_LOST, then at the second
* attempt to execute it, the mysql lib will reconnect and succeed.
Module: kamailio
Branch: master
Commit: ab0de3872c62084cf5d53b0f263fd7edd70e2781
URL: https://github.com/kamailio/kamailio/commit/ab0de3872c62084cf5d53b0f263fd7e…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2019-01-21T22:58:35+01:00
db_mysql: small unification for log macro usage for errors and warning
---
Modified: src/modules/db_mysql/db_mysql.c
Modified: src/modules/db_mysql/my_con.c
---
Diff: https://github.com/kamailio/kamailio/commit/ab0de3872c62084cf5d53b0f263fd7e…
Patch: https://github.com/kamailio/kamailio/commit/ab0de3872c62084cf5d53b0f263fd7e…
---
diff --git a/src/modules/db_mysql/db_mysql.c b/src/modules/db_mysql/db_mysql.c
index 4a79a1878d..da130f1818 100644
--- a/src/modules/db_mysql/db_mysql.c
+++ b/src/modules/db_mysql/db_mysql.c
@@ -139,14 +139,14 @@ static int mysql_mod_init(void)
my_recv_to= DEFAULT_MY_RECV_TO;
}
} else if (my_recv_to || my_send_to) {
- LOG(L_WARN, "WARNING: mysql send or received timeout set, but "
+ LM_WARN("WARNING: mysql send or received timeout set, but "
" not supported by the installed mysql client library"
" (needed at least 4.1.22 or 5.0.25, but installed %ld)\n",
my_client_ver);
}
#else
if (my_recv_to || my_send_to) {
- LOG(L_WARN, "WARNING: mysql send or received timeout set, but "
+ LM_WARN("WARNING: mysql send or received timeout set, but "
" not supported by the mysql client library used to compile"
" the mysql module (needed at least 4.1.1 but "
" compiled against %ld)\n", MYSQL_VERSION_ID);
diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c
index 0f0238aae8..d311f5b342 100644
--- a/src/modules/db_mysql/my_con.c
+++ b/src/modules/db_mysql/my_con.c
@@ -90,7 +90,7 @@ int my_con_connect(db_con_t* con)
if (!mysql_real_connect(mcon->con, muri->host, muri->username,
muri->password, muri->database, muri->port, 0, 0)) {
- LOG(L_ERR, "mysql: %s\n", mysql_error(mcon->con));
+ ERR("mysql: %s\n", mysql_error(mcon->con));
return -1;
}
Am Sonntag, 20. Januar 2019, 17:57:33 CET schrieb Mojtaba:
> Hello Henning,
>
> Thank you for replying.Sure. It would be useful. Thanks
> Using htable module is good idea, But if i want not to use htable module
> and save part of SIP Messagre in memory , How do i impelement auto-expire
> after afew time?
> With regards.
Hello Mojtaba,
please keep the list in CC.
The htable module support this memory storage and also auto-expiration out of
the box. :-)
You can find (a bit complicated) example in the usrloc module. A starting
point for the expiration logic can be the delete_ucontact(..) function there.
You need to store the SIP message data in a proper data structure like a list
or a hash table.
Best regards,
Henning
> On Sun, 20 Jan 2019, 18:47 Henning Westerholt, <hw(a)kamailio.org> wrote:
> > Am Samstag, 19. Januar 2019, 10:43:09 CET schrieb Mojtaba:
> > > Sorry for my mistake in subject!
> > > "Give me suggestions for module implementation", anyway,
> > > Give me suggestions for duplication detection algorithm?
> >
> > Hello Mojtaba,
> >
> > just to give you an idea: you can access and store parts of the message in
> > memory with e.g. the htable module. Then you can compare it during the
> > route
> > block with the new incoming message and reject it.
> >
> > I found this old discussion thread about a similar topic:
> > https://lists.kamailio.org/pipermail/users/2009-February/021906.html
> >
> > You can of course also implement this in a module, but in this case it
> > would
> > not be necessary.
> >
> > Maybe this is helpful for your as well.
--
Henning Westerholt - https://skalatan.de/blog/
Kamailio services - https://skalatan.de/services
Kamailio security assessment - https://skalatan.de/de/assessment
Hi all,
I was trying to add entries to a remote database on OpenWrt and kamctl (address add ...) seemed to just hang there. A bit of digging showed that it prompted for a password, but I couldn't see it because it redirected the prompt to /dev/stderr, which doesn't exist on every system. This patch addresses thist.
Use portable "#!/bin/sh" shebang. This may still be a symlink to bash
(or some other shell).
Also replace the redirection to "/dev/stderr" with a POSIX redirection
to stderr. "/dev/stderr" is not available on all systems and is also not
recognized by all shells (example: ash). On systems without a working
"/dev/stderr" the user will not see the prompts etc.
Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>
<!-- 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/1815
-- Commit Summary --
* kamctl: keep it POSIX
-- File Changes --
M utils/kamctl/kamctl (2)
M utils/kamctl/kamctl.base (6)
M utils/kamctl/kamctl.sqlbase (4)
M utils/kamctl/kamdbctl (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1815.patchhttps://github.com/kamailio/kamailio/pull/1815.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/1815