[sr-dev] git:master:4bab8e55: counters: docs - format section ids

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 4bab8e5587f59132afb21e29c5a08e71df3c6f8b
URL: 
https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e71df3c6f8b

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2018-04-16T19:30:33+02:00

counters: docs - format section ids

---

Modified: src/modules/counters/doc/counters_functions.xml
Modified: src/modules/counters/doc/counters_params.xml
Modified: src/modules/counters/doc/counters_rpc.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e71df3c6f8b.diff
Patch: 
https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e71df3c6f8b.patch

---

diff --git a/src/modules/counters/doc/counters_functions.xml 
b/src/modules/counters/doc/counters_functions.xml
index 9e6eae57fe..9a8b458092 100644
--- a/src/modules/counters/doc/counters_functions.xml
+++ b/src/modules/counters/doc/counters_functions.xml
@@ -15,7 +15,7 @@
 
Functions
 
-   
+   

cnt_inc([group.]name)

@@ -43,7 +43,7 @@ route {


 
-   
+   

cnt_add([group.]name, number)

@@ -69,7 +69,7 @@ route {


 
-   
+   

cnt_reset([group.]name)

diff --git a/src/modules/counters/doc/counters_params.xml 
b/src/modules/counters/doc/counters_params.xml
index f23f9484c4..b31d508b34 100644
--- a/src/modules/counters/doc/counters_params.xml
+++ b/src/modules/counters/doc/counters_params.xml
@@ -12,7 +12,7 @@

Parameters
 
-   
+   
script_counter

Define a new counter that can be used from the script.
@@ -40,7 +40,7 @@ modparam("counters", "script_counter", "test.x:another 
example") # test.x


 
-   
+   
script_cnt_grp_name

Group name that will be used for the counters defined
diff --git a/src/modules/counters/doc/counters_rpc.xml 
b/src/modules/counters/doc/counters_rpc.xml
index 6b8e237aeb..82d07e9ddf 100644
--- a/src/modules/counters/doc/counters_rpc.xml
+++ b/src/modules/counters/doc/counters_rpc.xml
@@ -12,7 +12,7 @@

RPC Commands
 
-   
+   
 cnt.get

Get the value of the counter identified by 
group.counter_name.
@@ -28,7 +28,7 @@


 
-   
+   
 cnt.reset

Resets the counter identified by group.counter_name.
@@ -44,7 +44,7 @@


 
-   
+   
 cnt.list_groups

Lists all the declared counter groups.
@@ -60,14 +60,14 @@


 
-   
+   
 cnt.grps_list

Alias to cnt.list_groups.


 
-   
+   
 cnt.list_vars

Lists all the names of all the counters belonging to the
@@ -84,14 +84,14 @@


 
-   
+   
 cnt.var_list

Alias to cnt.list_vars.


 
-   
+   
 cnt.get_vars

Lists all the counter names and their values in the
@@ -108,14 +108,14 @@


 
-   
+   
 cnt.grp_get_all

Alias to cnt.get_vars.


 
-   
+   
 cnt.help

Displays the counter description.


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Refactoring internal dialog id (#1500)

[Daniel-Constantin Mierla]

Option 1. was already implemented and prevents dialog id conflicts proper 
configuration of modparams for dialog module, but is not as flexible as the 2. 
and 3., therefore I am making this an enhancement request.

-- 
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/1500#issuecomment-381684264___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value (#1502)

[Daniel-Constantin Mierla]

Merged #1502.

-- 
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/1502#event-1576855720___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value (#1502)

[Daniel-Constantin Mierla]

Thanks!

-- 
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/1502#issuecomment-381682338___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] dialog: restore keep-alive after restart (#1501)

[Daniel-Constantin Mierla]

Thanks!

-- 
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/1501#issuecomment-381682157___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] dialog: restore keep-alive after restart (#1501)

[Daniel-Constantin Mierla]

Merged #1501.

-- 
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/1501#event-1576854662___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:0dc59586: Merge pull request #1502 from snen/dialog_fix_dmq_flag_value

[GitHub]

Module: kamailio
Branch: master
Commit: 0dc595862baa62535efc7519330514aa30b552b1
URL: 
https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514aa30b552b1

Author: Daniel-Constantin Mierla 
Committer: GitHub 
Date: 2018-04-16T19:19:22+02:00

Merge pull request #1502 from snen/dialog_fix_dmq_flag_value

dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value

---

Modified: src/modules/dialog/dlg_hash.h

---

Diff:  
https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514aa30b552b1.diff
Patch: 
https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514aa30b552b1.patch

---

diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h
index 91eb129d67..85fdc6cb83 100644
--- a/src/modules/dialog/dlg_hash.h
+++ b/src/modules/dialog/dlg_hash.h
@@ -78,7 +78,7 @@
 #define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on 
in-dialog messages reception */
 #define DLG_IFLAG_CSEQ_DIFF (1<<4) /*!< CSeq changed in dialog */
 #define DLG_IFLAG_PRACK (1<<5) /*!< PRACK was routed during 
initial state */
-#define DLG_IFLAG_DMQ_SYNC  (1<<5) /*!< sync this dialog via dmq DMQ*/
+#define DLG_IFLAG_DMQ_SYNC  (1<<6) /*!< sync this dialog via dmq DMQ*/
 
 #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */
 #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:ad427fc1: dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value

[Dmitri Savolainen]

Module: kamailio
Branch: master
Commit: ad427fc19c56110f66df86b7b49e23c00313610a
URL: 
https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c00313610a

Author: Dmitri Savolainen 
Committer: Dmitri Savolainen 
Date: 2018-04-16T19:43:50+03:00

dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value

---

Modified: src/modules/dialog/dlg_hash.h

---

Diff:  
https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c00313610a.diff
Patch: 
https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c00313610a.patch

---

diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h
index 91eb129d67..85fdc6cb83 100644
--- a/src/modules/dialog/dlg_hash.h
+++ b/src/modules/dialog/dlg_hash.h
@@ -78,7 +78,7 @@
 #define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on 
in-dialog messages reception */
 #define DLG_IFLAG_CSEQ_DIFF (1<<4) /*!< CSeq changed in dialog */
 #define DLG_IFLAG_PRACK (1<<5) /*!< PRACK was routed during 
initial state */
-#define DLG_IFLAG_DMQ_SYNC  (1<<5) /*!< sync this dialog via dmq DMQ*/
+#define DLG_IFLAG_DMQ_SYNC  (1<<6) /*!< sync this dialog via dmq DMQ*/
 
 #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */
 #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:a821ff61: dialog: restore keep-alive after restart

[Dmitri Savolainen]

Module: kamailio
Branch: master
Commit: a821ff61029a4e8a9f220d60f95bd7b5a545f9b4
URL: 
https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b5a545f9b4

Author: Dmitri Savolainen 
Committer: Dmitri Savolainen 
Date: 2018-04-16T19:32:05+03:00

dialog: restore keep-alive after restart

---

Modified: src/modules/dialog/dlg_db_handler.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b5a545f9b4.diff
Patch: 
https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b5a545f9b4.patch

---

diff --git a/src/modules/dialog/dlg_db_handler.c 
b/src/modules/dialog/dlg_db_handler.c
index 2a3e4301ad..eb1d97d7b7 100644
--- a/src/modules/dialog/dlg_db_handler.c
+++ b/src/modules/dialog/dlg_db_handler.c
@@ -464,6 +464,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int 
fetch_num_rows,
srjson_DestroyDoc();
}
dlg->iflags = (unsigned int)VAL_INT(values+22);
+   if (dlg->state==DLG_STATE_CONFIRMED)
+   dlg_ka_add(dlg);
 
if (!dlg->bind_addr[DLG_CALLER_LEG] || 
!dlg->bind_addr[DLG_CALLEE_LEG]) {
/* non-local socket, probably not our dialog */


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:2fcfc666: Merge pull request #1501 from snen/fix_dialog_options_restart

[GitHub]

Module: kamailio
Branch: master
Commit: 2fcfc621cd8108de251eb5cfba48f365d2c6
URL: 
https://github.com/kamailio/kamailio/commit/2fcfc621cd8108de251eb5cfba48f365d2c6

Author: Daniel-Constantin Mierla 
Committer: GitHub 
Date: 2018-04-16T19:18:48+02:00

Merge pull request #1501 from snen/fix_dialog_options_restart

dialog: restore keep-alive after restart

---

Modified: src/modules/dialog/dlg_db_handler.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/2fcfc621cd8108de251eb5cfba48f365d2c6.diff
Patch: 
https://github.com/kamailio/kamailio/commit/2fcfc621cd8108de251eb5cfba48f365d2c6.patch

---

diff --git a/src/modules/dialog/dlg_db_handler.c 
b/src/modules/dialog/dlg_db_handler.c
index 2a3e4301ad..eb1d97d7b7 100644
--- a/src/modules/dialog/dlg_db_handler.c
+++ b/src/modules/dialog/dlg_db_handler.c
@@ -464,6 +464,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int 
fetch_num_rows,
srjson_DestroyDoc();
}
dlg->iflags = (unsigned int)VAL_INT(values+22);
+   if (dlg->state==DLG_STATE_CONFIRMED)
+   dlg_ka_add(dlg);
 
if (!dlg->bind_addr[DLG_CALLER_LEG] || 
!dlg->bind_addr[DLG_CALLEE_LEG]) {
/* non-local socket, probably not our dialog */


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] [kamailio/kamailio] dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value (#1502)

[Dmitri Savolainen]

 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)
- [ ] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)

 Checklist:

- [x] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue # (replace  with an open issue number)

 Description
typo fix for DLG_IFLAG_DMQ_SYNC flag value

You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/1502

-- Commit Summary --

  * dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value

-- File Changes --

M src/modules/dialog/dlg_hash.h (2)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/1502.patch
https://github.com/kamailio/kamailio/pull/1502.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/1502
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] [kamailio/kamailio] dialog: restore keep-alive after restart (#1501)

[Dmitri Savolainen]

 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)
- [ ] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)

 Checklist:

- [x] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue # (replace  with an open issue number)

 Description
I've noticed kamailio stop send OPTIONS ("ka-dst"/"ka-src" params) after 
restart. This should fix

You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/1501

-- Commit Summary --

  * dialog: restore keep-alive after restart

-- File Changes --

M src/modules/dialog/dlg_db_handler.c (2)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/1501.patch
https://github.com/kamailio/kamailio/pull/1501.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/1501
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] http_async_client: memory mismanagement (#1407)

[Giacomo Vacca]

FYI this was kamailio `5.1.0` on debian 8, with stock libcurl (`7.38`).
I'm trying to reproduce the issue with `5.1.2` and both libcurl `7.38` and 
`7.59` (still on debian 8) (including with restarts under load), and I will 
update here with any relevant information.

-- 
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/1407#issuecomment-381539603___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] [kamailio/kamailio] Solve the high potential of having conflicts for internal dialog id in multiple simultaneous kamailio instances (#1500)

[alexsosic]

Regarding the issue 1274 (https://github.com/kamailio/kamailio/issues/1274) 
there's a problem in highly scalable environments to avoid conflicts in storing 
dialogs in the same DB.

As @miconda pointed out:
> The internal id is made from two integers, hash entry and hash id (h_entry, 
> h_id). h_entry is the index of the slot in the hash table used to store the 
> dialog structure, computed by hashing over call id. h_id is an incremented 
> integer specific for each hash table slot.
> 
> So, when loading a new record from database, if its h_id is not conflicting 
> with an existing dialog on the same hash table slot, all is ok, otherwise the 
> module is not going to work properly with two dialogs having same h_id.
> 
> So, when loading a new record from database, if its h_id is not conflicting 
> with an existing dialog on the same hash table slot, all is ok, otherwise the 
> module is not going to work properly with two dialogs having same h_id.
> 
> Among solutions I thought of:
> 
> 1. have the servers generating non conflicting h_id, by having a start value 
> different per server and an increment step larger than the number of servers. 
> Iirc, here was at some point a similar attempt, but somehow didn't make it. 
> Let's say one has two servers, first server starts allocating h_id from 1 and 
> increments by 2 (e.g: 1, 3, 5, ...) and the seconds start from 2 and 
> increments with 2 (2, 4, 6, ...). Those values can be set via mod params, 
> eventually with an option to rely on server_id.
> This should be the least intrusive in the other modules built on top of 
> dialog. But it is rather rigid, with the example above, if one adds an extra 
> server, it needs to reconfigure the old ones, so each server starts from 
> either 1, 2 or 3 and increment by 3. Of course, one can set increment step to 
> a larger value, like 100, and then has flexibility to deploy up to 1 hundred 
> servers before having to reconfigure in case there is need for more server.
> 
> 2. add server_id as the third field in the dialog id. It will require review 
> of other modules using dialog and eventual code updates in those modules. One 
> column to store the server_id needs to be added to dialog db tables.
> 
> 3. switch from this conflicting id system to something like string unique 
> ids, similar to what we have in usrloc records. This will require coding in 
> other modules, changes to database schema, etc., so more work comparing with 
> the above two, but could be the best in long term.

It would be great to have the option 3 developed if possible but we would also 
be satisfied with the option 2 to have a third field, server_id, in the dialog 
id.

Thank You!
--
Alex

-- 
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/1500___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev