kamailio.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
List overview
Download
sr-dev
November 2020
----- 2024 -----
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
sr-dev@lists.kamailio.org
22 participants
311 discussions
Start a n
N
ew thread
git:master:c87f5202: permissions: basic safety for concurrent RPC reload
by Victor Seva
Module: kamailio Branch: master Commit: c87f5202d778cf110ce0fbbc554310c148e997cb URL:
https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-11-05T11:40:58+01:00 permissions: basic safety for concurrent RPC reload * same logic as 99d5da8d595961063249f871a5d150474fa6f317 --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h Modified: src/modules/permissions/rpc.c --- Diff:
https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c…
Patch:
https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c…
--- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index be22963d81..7e447d14d2 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -88,7 +88,7 @@ str perm_address_file = STR_NULL; /* Full path to file with address records */ static int perm_check_all_branches = 1; - +time_t *perm_rpc_reload_time = NULL; int _perm_max_subnets = 512; int _perm_load_backends = 0xFFFF; @@ -587,6 +587,13 @@ static int mod_init(void) return -1; } + perm_rpc_reload_time = shm_malloc(sizeof(time_t)); + if(perm_rpc_reload_time == NULL) { + SHM_MEM_ERROR; + return -1; + } + *perm_rpc_reload_time = 0; + if(permissions_init_rpc()!=0) { LM_ERR("failed to register RPC commands\n"); return -1; @@ -674,6 +681,11 @@ static void mod_exit(void) { int i; + if(perm_rpc_reload_time!=NULL) { + shm_free(perm_rpc_reload_time); + perm_rpc_reload_time = 0; + } + for(i = 0; i < perm_rules_num; i++) { if(perm_allow[i].rules) free_rule(perm_allow[i].rules); if(perm_allow[i].filename) pkg_free(perm_allow[i].filename); diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index 785d6c94de..c094185626 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -66,6 +66,7 @@ extern int perm_peer_tag_mode; /* Matching mode */ #define PERM_LOAD_ALLOWFILE (1<<2) #define PERM_LOAD_DENYFILE (1<<3) extern int _perm_load_backends; /* */ +extern time_t *perm_rpc_reload_time; typedef struct int_or_pvar { unsigned int i; diff --git a/src/modules/permissions/rpc.c b/src/modules/permissions/rpc.c index 844cdec674..b6a6f9a420 100644 --- a/src/modules/permissions/rpc.c +++ b/src/modules/permissions/rpc.c @@ -30,10 +30,30 @@ #include "permissions.h" +int rpc_check_reload(rpc_t* rpc, void* ctx) { + if(perm_rpc_reload_time==NULL) { + LM_ERR("not ready for reload\n"); + rpc->fault(ctx, 500, "Not ready for reload"); + return -1; + } + if(*perm_rpc_reload_time!=0 && *perm_rpc_reload_time > time(NULL) - 5) { + LM_ERR("ongoing reload\n"); + rpc->fault(ctx, 500, "ongoing reload"); + return -1; + } + *perm_rpc_reload_time = time(NULL); + return 0; +} + /*! \brief * RPC function to reload trusted table */ void rpc_trusted_reload(rpc_t* rpc, void* c) { + + if(rpc_check_reload(rpc, c) < 0) { + return; + } + if (reload_trusted_table_cmd () != 1) { rpc->fault(c, 500, "Reload failed."); return; @@ -67,6 +87,11 @@ void rpc_trusted_dump(rpc_t* rpc, void* c) { * RPC function to reload address table */ void rpc_address_reload(rpc_t* rpc, void* c) { + + if(rpc_check_reload(rpc, c) < 0) { + return; + } + if (reload_address_table_cmd () != 1) { rpc->fault(c, 500, "Reload failed."); return;
3 years, 5 months
1
0
0
0
git:master:d0cb5a6e: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev
Module: kamailio Branch: master Commit: d0cb5a6ecf6cb3962e45f28926f4361a64ca613a URL:
https://github.com/kamailio/kamailio/commit/d0cb5a6ecf6cb3962e45f28926f4361…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-04T13:01:16+01:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff:
https://github.com/kamailio/kamailio/commit/d0cb5a6ecf6cb3962e45f28926f4361…
Patch:
https://github.com/kamailio/kamailio/commit/d0cb5a6ecf6cb3962e45f28926f4361…
3 years, 5 months
1
0
0
0
git:master:7b70dcb2: dmq: docs - more details about functionality
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: 7b70dcb291f290e6b563fb7baef4df9fc8116a1b URL:
https://github.com/kamailio/kamailio/commit/7b70dcb291f290e6b563fb7baef4df9…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T12:48:48+01:00 dmq: docs - more details about functionality - use of standard channel term, similar to other distributed message queues - docs for notifications_channel new parameter --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff:
https://github.com/kamailio/kamailio/commit/7b70dcb291f290e6b563fb7baef4df9…
Patch:
https://github.com/kamailio/kamailio/commit/7b70dcb291f290e6b563fb7baef4df9…
3 years, 5 months
1
0
0
0
git:master:798494f2: dmq: new parameter notification_channel
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: 798494f2ac16be585e84919f046c4ab43cadbdf5 URL:
https://github.com/kamailio/kamailio/commit/798494f2ac16be585e84919f046c4ab…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T11:29:56+01:00 dmq: new parameter notification_channel - allow setting the channel id for peer availability notifications - default is "notification_peer" --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/notification_peer.c --- Diff:
https://github.com/kamailio/kamailio/commit/798494f2ac16be585e84919f046c4ab…
Patch:
https://github.com/kamailio/kamailio/commit/798494f2ac16be585e84919f046c4ab…
--- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 509c42c405..337d75c1b9 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -60,6 +60,7 @@ str dmq_server_socket = {0, 0}; sip_uri_t dmq_server_uri = {0}; str dmq_notification_address = {0, 0}; +str dmq_notification_channel = str_init("notification_peer"); int dmq_multi_notify = 0; sip_uri_t dmq_notification_uri = {0}; int dmq_ping_interval = 60; @@ -109,6 +110,7 @@ static param_export_t params[] = { {"ping_interval", INT_PARAM, &dmq_ping_interval}, {"server_address", PARAM_STR, &dmq_server_address}, {"notification_address", PARAM_STR, &dmq_notification_address}, + {"notification_channel", PARAM_STR, &dmq_notification_channel}, {"multi_notify", INT_PARAM, &dmq_multi_notify}, {"worker_usleep", INT_PARAM, &dmq_worker_usleep}, {0, 0, 0} diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 4cb44c0dee..83da389269 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -32,6 +32,7 @@ dmq_resp_cback_t dmq_notification_resp_callback = {¬ification_resp_callback_f int *dmq_init_callback_done = 0; +extern str dmq_notification_channel; /** * @brief add notification peer @@ -43,10 +44,8 @@ int add_notification_peer() memset(¬_peer, 0, sizeof(dmq_peer_t)); not_peer.callback = dmq_notification_callback_f; not_peer.init_callback = NULL; - not_peer.description.s = "notification_peer"; - not_peer.description.len = 17; - not_peer.peer_id.s = "notification_peer"; - not_peer.peer_id.len = 17; + not_peer.description = dmq_notification_channel; + not_peer.peer_id = dmq_notification_channel; dmq_notification_peer = register_dmq_peer(¬_peer); if(!dmq_notification_peer) { LM_ERR("error in register_dmq_peer\n");
3 years, 5 months
1
0
0
0
git:master:960b60ed: dialog: skip doing cseq update processing for non-sip requests
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: 960b60ede8543f38b61ad2769e81e11d5a777df8 URL:
https://github.com/kamailio/kamailio/commit/960b60ede8543f38b61ad2769e81e11…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T11:15:10+01:00 dialog: skip doing cseq update processing for non-sip requests --- Modified: src/modules/dialog/dlg_cseq.c --- Diff:
https://github.com/kamailio/kamailio/commit/960b60ede8543f38b61ad2769e81e11…
Patch:
https://github.com/kamailio/kamailio/commit/960b60ede8543f38b61ad2769e81e11…
--- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index a85b726514..17c63bbb1c 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,12 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len<=0)) { + if(!IS_SIP(&msg)) { + /* nothing to do for non-sip requests */ + goto done; + } + + if(get_to(&msg)->tag_value.len<=0) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;
3 years, 5 months
1
0
0
0
git:5.3:5ffe28d4: dialog: proper to-tag check for initial requests to skip cseq updates
by Daniel-Constantin Mierla
Module: kamailio Branch: 5.3 Commit: 5ffe28d4b83b1a75b1706bd851b76575b3d09c45 URL:
https://github.com/kamailio/kamailio/commit/5ffe28d4b83b1a75b1706bd851b7657…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T08:12:28+01:00 dialog: proper to-tag check for initial requests to skip cseq updates (cherry picked from commit 81d3e7a43a249dfc9eaa075c698e1eb3237a517e) (cherry picked from commit 5bd72f2758b2059759ce152e6d97b6a1955bc5bc) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff:
https://github.com/kamailio/kamailio/commit/5ffe28d4b83b1a75b1706bd851b7657…
Patch:
https://github.com/kamailio/kamailio/commit/5ffe28d4b83b1a75b1706bd851b7657…
--- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 021cc101e8..a85b726514 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len>0)) { + if((get_to(&msg)->tag_value.len<=0)) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;
3 years, 5 months
1
0
0
0
git:5.4:5bd72f27: dialog: proper to-tag check for initial requests to skip cseq updates
by Daniel-Constantin Mierla
Module: kamailio Branch: 5.4 Commit: 5bd72f2758b2059759ce152e6d97b6a1955bc5bc URL:
https://github.com/kamailio/kamailio/commit/5bd72f2758b2059759ce152e6d97b6a…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T08:11:34+01:00 dialog: proper to-tag check for initial requests to skip cseq updates (cherry picked from commit 81d3e7a43a249dfc9eaa075c698e1eb3237a517e) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff:
https://github.com/kamailio/kamailio/commit/5bd72f2758b2059759ce152e6d97b6a…
Patch:
https://github.com/kamailio/kamailio/commit/5bd72f2758b2059759ce152e6d97b6a…
--- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 021cc101e8..a85b726514 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len>0)) { + if((get_to(&msg)->tag_value.len<=0)) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;
3 years, 5 months
1
0
0
0
git:master:81d3e7a4: dialog: proper to-tag check for initial requests to skip cseq updates
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: 81d3e7a43a249dfc9eaa075c698e1eb3237a517e URL:
https://github.com/kamailio/kamailio/commit/81d3e7a43a249dfc9eaa075c698e1eb…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-04T08:09:39+01:00 dialog: proper to-tag check for initial requests to skip cseq updates --- Modified: src/modules/dialog/dlg_cseq.c --- Diff:
https://github.com/kamailio/kamailio/commit/81d3e7a43a249dfc9eaa075c698e1eb…
Patch:
https://github.com/kamailio/kamailio/commit/81d3e7a43a249dfc9eaa075c698e1eb…
--- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 021cc101e8..a85b726514 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len>0)) { + if((get_to(&msg)->tag_value.len<=0)) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;
3 years, 5 months
1
0
0
0
git:master:00a4efc8: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev
Module: kamailio Branch: master Commit: 00a4efc80c8023dddcc0da8e0b19da89147714ab URL:
https://github.com/kamailio/kamailio/commit/00a4efc80c8023dddcc0da8e0b19da8…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-03T15:16:14+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff:
https://github.com/kamailio/kamailio/commit/00a4efc80c8023dddcc0da8e0b19da8…
Patch:
https://github.com/kamailio/kamailio/commit/00a4efc80c8023dddcc0da8e0b19da8…
3 years, 5 months
1
0
0
0
git:master:340f38f5: acc: docs for acc_extra_nullable parameter
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: 340f38f5349e41c849764043df7ee1a808b5ec23 URL:
https://github.com/kamailio/kamailio/commit/340f38f5349e41c849764043df7ee1a…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-03T15:00:54+01:00 acc: docs for acc_extra_nullable parameter --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff:
https://github.com/kamailio/kamailio/commit/340f38f5349e41c849764043df7ee1a…
Patch:
https://github.com/kamailio/kamailio/commit/340f38f5349e41c849764043df7ee1a…
--- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index a990db04a4..d1c007312e 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -623,6 +623,25 @@ modparam("acc", "acc_prepare_flag", 5) ... modparam("acc", "acc_prepare_always", 1) ... +</programlisting> + </example> + </section> + <section id="acc.p.acc_extra_nullable"> + <title><varname>acc_extra_nullable</varname> (integer)</title> + <para> + If set to 1, the database acc extra fields are set to NULL if the + corresponding script variable is not defined or has $null value. If + set to 0, the value is saved as empty string (the existing behavior). + </para> + <para> + Default value is 0. + </para> + <example> + <title>acc_extra_nullable example</title> + <programlisting format="linespecific"> +... +modparam("acc", "acc_extra_nullable", 1) +... </programlisting> </example> </section>
3 years, 5 months
1
0
0
0
← Newer
1
...
26
27
28
29
30
31
32
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
Results per page:
10
25
50
100
200