[sr-dev] git:master:0dac4a75: Merge pull request #2353 from kamailio/grumvalski/ds_keep_load
Module: kamailio
Branch: master
Commit: 0dac4a759b841450a757f0ecdbf6d431d62bff87
URL:
https://github.com/kamailio/kamailio/commit/0dac4a759b841450a757f0ecdbf6d431d62bff87
Author: Federico Cabiddu
Committer: GitHub
Date: 2020-06-12T07:50:46+02:00
Merge pull request #2353 from kamailio/grumvalski/ds_keep_load
dispatcher: keep current destinations' load when adding/removing
---
Modified: src/modules/dispatcher/dispatch.c
---
Diff:
https://github.com/kamailio/kamailio/commit/0dac4a759b841450a757f0ecdbf6d431d62bff87.diff
Patch:
https://github.com/kamailio/kamailio/commit/0dac4a759b841450a757f0ecdbf6d431d62bff87.patch
---
diff --git a/src/modules/dispatcher/dispatch.c
b/src/modules/dispatcher/dispatch.c
index f481cb4d61..66b35742e5 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -353,7 +353,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs)
/**
*
*/
-ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs)
+ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload)
{
ds_dest_t *dp = NULL;
/* For DNS-Lookups */
@@ -419,6 +419,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str
*attrs)
dp->flags = flags;
dp->priority = priority;
+ dp->dload = dload;
if(ds_set_attrs(dp, attrs) < 0) {
LM_ERR("cannot set attributes!\n");
@@ -498,14 +499,14 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority,
str *attrs)
*
*/
int add_dest2list(int id, str uri, int flags, int priority, str *attrs,
- int list_idx, int *setn)
+ int list_idx, int *setn, int dload)
{
ds_dest_t *dp = NULL;
ds_set_t *sp = NULL;
ds_dest_t *dp0 = NULL;
ds_dest_t *dp1 = NULL;
- dp = pack_dest(uri, flags, priority, attrs);
+ dp = pack_dest(uri, flags, priority, attrs, dload);
if(!dp)
goto err;
@@ -854,7 +855,7 @@ int ds_load_list(char *lfile)
attrs.len = p - attrs.s;
add_destination:
- if(add_dest2list(id, uri, flags, priority, , *next_idx,
)
+ if(add_dest2list(id, uri, flags, priority, , *next_idx,
, 0)
!= 0) {
LM_WARN("unable to add destination %.*s to set %d --
skipping\n",
uri.len, uri.s, id);
@@ -1104,7 +1105,7 @@ int ds_load_db(void)
}
}
LM_DBG("attributes string: [%.*s]\n", attrs.len,
(attrs.s)?attrs.s:"");
- if(add_dest2list(id, uri, flags, priority, , *next_idx,
)
+ if(add_dest2list(id, uri, flags, priority, , *next_idx,
, 0)
!= 0) {
dest_errs++;
LM_WARN("unable to add destination %.*s to set %d --
skipping\n",
@@ -2420,7 +2421,7 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg)
if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags,
node->dlist[i].priority, >dlist[i].attrs.body,
*next_idx,
- ) != 0) {
+ , node->dlist[i].dload) != 0) {
LM_WARN("failed to add destination in group %d - %.*s\n",
node->id, node->dlist[i].uri.len,
node->dlist[i].uri.s);
}
@@ -2443,7 +2444,7 @@ int ds_add_dst(int group, str *address, int flags, str
*attrs)
// add new destination
if(add_dest2list(group, *address, flags, priority, attrs,
- *next_idx, ) != 0) {
+ *next_idx, , 0) != 0) {
LM_WARN("unable to add destination %.*s to set %d",
address->len, address->s, group);
if(ds_load_mode==1) {
goto error;
@@ -2478,7 +2479,7 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg)
if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags,
node->dlist[i].priority, >dlist[i].attrs.body,
*next_idx,
- filter_arg->setn) != 0) {
+ filter_arg->setn, node->dlist[i].dload) != 0) {
LM_WARN("failed to add destination in group %d - %.*s\n",
node->id, node->dlist[i].uri.len,
node->dlist[i].uri.s);
}
@@ -2494,7 +2495,7 @@ int ds_remove_dst(int group, str *address)
setn = 0;
- dp = pack_dest(*address, 0, 0, NULL);
+ dp = pack_dest(*address, 0, 0, NULL, 0);
filter_arg.setid = group;
filter_arg.dest = dp;
filter_arg.setn =
___
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] dispatcher: keep current destinations' load when adding/removing (#2353)
Merged #2353 into master. -- 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/2353#event-343725___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:8d9e6578: dispatcher: keep current destinations' load when adding/removing
Module: kamailio
Branch: master
Commit: 8d9e65789fe2f6da2648449639620899b1d1b2c3
URL:
https://github.com/kamailio/kamailio/commit/8d9e65789fe2f6da2648449639620899b1d1b2c3
Author: Federico Cabiddu
Committer: Federico Cabiddu
Date: 2020-06-10T07:17:13+02:00
dispatcher: keep current destinations' load when adding/removing
---
Modified: src/modules/dispatcher/dispatch.c
---
Diff:
https://github.com/kamailio/kamailio/commit/8d9e65789fe2f6da2648449639620899b1d1b2c3.diff
Patch:
https://github.com/kamailio/kamailio/commit/8d9e65789fe2f6da2648449639620899b1d1b2c3.patch
---
diff --git a/src/modules/dispatcher/dispatch.c
b/src/modules/dispatcher/dispatch.c
index f481cb4d61..66b35742e5 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -353,7 +353,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs)
/**
*
*/
-ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs)
+ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload)
{
ds_dest_t *dp = NULL;
/* For DNS-Lookups */
@@ -419,6 +419,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str
*attrs)
dp->flags = flags;
dp->priority = priority;
+ dp->dload = dload;
if(ds_set_attrs(dp, attrs) < 0) {
LM_ERR("cannot set attributes!\n");
@@ -498,14 +499,14 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority,
str *attrs)
*
*/
int add_dest2list(int id, str uri, int flags, int priority, str *attrs,
- int list_idx, int *setn)
+ int list_idx, int *setn, int dload)
{
ds_dest_t *dp = NULL;
ds_set_t *sp = NULL;
ds_dest_t *dp0 = NULL;
ds_dest_t *dp1 = NULL;
- dp = pack_dest(uri, flags, priority, attrs);
+ dp = pack_dest(uri, flags, priority, attrs, dload);
if(!dp)
goto err;
@@ -854,7 +855,7 @@ int ds_load_list(char *lfile)
attrs.len = p - attrs.s;
add_destination:
- if(add_dest2list(id, uri, flags, priority, , *next_idx,
)
+ if(add_dest2list(id, uri, flags, priority, , *next_idx,
, 0)
!= 0) {
LM_WARN("unable to add destination %.*s to set %d --
skipping\n",
uri.len, uri.s, id);
@@ -1104,7 +1105,7 @@ int ds_load_db(void)
}
}
LM_DBG("attributes string: [%.*s]\n", attrs.len,
(attrs.s)?attrs.s:"");
- if(add_dest2list(id, uri, flags, priority, , *next_idx,
)
+ if(add_dest2list(id, uri, flags, priority, , *next_idx,
, 0)
!= 0) {
dest_errs++;
LM_WARN("unable to add destination %.*s to set %d --
skipping\n",
@@ -2420,7 +2421,7 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg)
if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags,
node->dlist[i].priority, >dlist[i].attrs.body,
*next_idx,
- ) != 0) {
+ , node->dlist[i].dload) != 0) {
LM_WARN("failed to add destination in group %d - %.*s\n",
node->id, node->dlist[i].uri.len,
node->dlist[i].uri.s);
}
@@ -2443,7 +2444,7 @@ int ds_add_dst(int group, str *address, int flags, str
*attrs)
// add new destination
if(add_dest2list(group, *address, flags, priority, attrs,
- *next_idx, ) != 0) {
+ *next_idx, , 0) != 0) {
LM_WARN("unable to add destination %.*s to set %d",
address->len, address->s, group);
if(ds_load_mode==1) {
goto error;
@@ -2478,7 +2479,7 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg)
if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags,
node->dlist[i].priority, >dlist[i].attrs.body,
*next_idx,
- filter_arg->setn) != 0) {
+ filter_arg->setn, node->dlist[i].dload) != 0) {
LM_WARN("failed to add destination in group %d - %.*s\n",
node->id, node->dlist[i].uri.len,
node->dlist[i].uri.s);
}
@@ -2494,7 +2495,7 @@ int ds_remove_dst(int group, str *address)
setn = 0;
- dp = pack_dest(*address, 0, 0, NULL);
+ dp = pack_dest(*address, 0, 0, NULL, 0);
filter_arg.setid = group;
filter_arg.dest = dp;
filter_arg.setn =
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] dialog: reason behind not storing early state dialogs in db
Dear all this would be related to one query we sent to sr-users some time ago? https://lists.kamailio.org/pipermail/sr-users/2018-November/103842.html we would also be interested in having the dialog structure to be written on db_redis during early dialog, but it still was in a to do list according to Daniel. This would great to be able to track and store the dialogs on a db redis for HA. thanks a lot and regards david El mié., 10 jun. 2020 a las 11:25, Henning Westerholt () escribió: > Hi Victor, > > I guess it was done because of easier implementation and also DB load > considerations. > > I planned to add functionality to make it configurable in git master it > this week, as I also have the requirements in one of my projects. > > Cheers, > > Henning > > -- > Henning Westerholt – https://skalatan.de/blog/ > Kamailio services – https://gilawa.com > > -Original Message- > From: sr-dev On Behalf Of Victor Seva > Sent: Wednesday, June 10, 2020 10:32 AM > To: Kamailio Devel List > Subject: [sr-dev] dialog: reason behind not storing early state dialogs in > db > > Hi, > > is there a known reason not to store early state dialogs in db? > > I have some logic relaying on event_route exported by dialog module and > that logic breaks for non confirmed dialogs when a switch-over happens > since those dialogs are not loaded from db. > > Thanks in advance, > Victor > > > ___ > Kamailio (SER) - Development Mailing List > sr-dev@lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev > > > ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:7bf0fc43: core: remove compiler warnings [-Wstring-plus-int]
Module: kamailio
Branch: 5.3
Commit: 7bf0fc433008f4a0e0bd1e7eb7583fb989df973c
URL:
https://github.com/kamailio/kamailio/commit/7bf0fc433008f4a0e0bd1e7eb7583fb989df973c
Author: Victor Seva
Committer: Daniel-Constantin Mierla
Date: 2020-06-11T21:36:57+02:00
core: remove compiler warnings [-Wstring-plus-int]
> core/parser/parse_fline.c:241:17: warning: adding 'int' to a string does not
> append to the string [-Wstring-plus-int]
>SIP_VERSION+1, SIP_VERSION_LEN-1)) {
>~~~^~
>
> core/parser/parse_fline.c:241:17: note: use array indexing to silence this
> warning
>SIP_VERSION+1, SIP_VERSION_LEN-1)) {
> ^
>& [ ]
> core/parser/parse_fline.c:247:18: warning: adding 'int' to a string does not
> append to the string [-Wstring-plus-int]
>HTTP_VERSION+1, HTTP_VERSION_LEN-1)) {
>^~
>
> core/parser/parse_fline.c:247:18: note: use array indexing to silence this
> warning
>HTTP_VERSION+1, HTTP_VERSION_LEN-1)) {
>^
>& [ ]
>
> 2 warnings generated.
(cherry picked from commit f2959f422bb8171241728f5148d4b21c9cc2c681)
---
Modified: src/core/parser/parse_fline.c
---
Diff:
https://github.com/kamailio/kamailio/commit/7bf0fc433008f4a0e0bd1e7eb7583fb989df973c.diff
Patch:
https://github.com/kamailio/kamailio/commit/7bf0fc433008f4a0e0bd1e7eb7583fb989df973c.patch
---
diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c
index a5aefb7ee8..5016a31d59 100644
--- a/src/core/parser/parse_fline.c
+++ b/src/core/parser/parse_fline.c
@@ -238,13 +238,13 @@ char* parse_first_line(char* buffer, unsigned int len,
struct msg_start* fl)
&& (fl->u.request.version.s[0]=='S'
|| fl->u.request.version.s[0]=='s')
&& !strncasecmp(fl->u.request.version.s+1,
- SIP_VERSION+1, SIP_VERSION_LEN-1)) {
+ _VERSION[1], SIP_VERSION_LEN-1)) {
fl->flags|=FLINE_FLAG_PROTO_SIP;
} else if(fl->u.request.version.len >= HTTP_VERSION_LEN
&& (fl->u.request.version.s[0]=='H'
|| fl->u.request.version.s[0]=='h')
&& !strncasecmp(fl->u.request.version.s+1,
- HTTP_VERSION+1, HTTP_VERSION_LEN-1)) {
+ _VERSION[1], HTTP_VERSION_LEN-1)) {
fl->flags|=FLINE_FLAG_PROTO_HTTP;
}
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:1797a30e: core: remove compiler warnings [-Wstring-plus-int]
Module: kamailio
Branch: 5.3
Commit: 1797a30ec4a8aebab323a08f832d16d74958b765
URL:
https://github.com/kamailio/kamailio/commit/1797a30ec4a8aebab323a08f832d16d74958b765
Author: Victor Seva
Committer: Daniel-Constantin Mierla
Date: 2020-06-11T21:36:57+02:00
core: remove compiler warnings [-Wstring-plus-int]
> core/parser/parse_fline.c:93:34: warning: adding 'int' to a string does not
> append to the string [-Wstring-plus-int]
> strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 &&
> ~~~^~
>
> core/parser/parse_fline.c:121:9: warning: adding 'int' to a string does not
> append to the string [-Wstring-plus-int]
> } else IFISMETHOD( INVITE, 'I' )
> ^
>
> core/parser/msg_parser.h:131:35: note: expanded from macro 'IFISMETHOD'
> strncasecmp( tmp+1, #methodname +1, methodname##_LEN-1)==0 &&
> \
> ^~
(cherry picked from commit 2b070a622fa3c78d929580fda3c7952963c4066b)
---
Modified: src/core/parser/msg_parser.h
Modified: src/core/parser/parse_fline.c
---
Diff:
https://github.com/kamailio/kamailio/commit/1797a30ec4a8aebab323a08f832d16d74958b765.diff
Patch:
https://github.com/kamailio/kamailio/commit/1797a30ec4a8aebab323a08f832d16d74958b765.patch
---
diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h
index 2aad6ecb84..8d242d2832 100644
--- a/src/core/parser/msg_parser.h
+++ b/src/core/parser/msg_parser.h
@@ -128,7 +128,7 @@ typedef enum request_method {
#define IFISMETHOD(methodname,firstchar) \
if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \
- strncasecmp( tmp+1, #methodname +1, methodname##_LEN-1)==0 &&
\
+ strncasecmp( tmp+1,
Re: [sr-dev] [kamailio/kamailio] sqlops: export sql_pvquery to KEMI (#2354)
Thanks! It can be merged. -- 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/2354#issuecomment-642879573___ 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] dispatcher: keep current destinations' load when adding/removing (#2353)
Thanks, can be merged! -- 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/2353#issuecomment-642879099___ 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] keepalive: logging state of dest just if changed (#2352)
Merged #2352 into master. -- 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/2352#event-3435592435___ 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] keepalive: logging state of dest just if changed (#2352)
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/2352#issuecomment-642878531___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f748835d: Merge pull request #2352 from kamailio/feature/keepalive-new-state-log-feedback
Module: kamailio
Branch: master
Commit: f748835d507c9f2a7f231efa10ce65f42d77831d
URL:
https://github.com/kamailio/kamailio/commit/f748835d507c9f2a7f231efa10ce65f42d77831d
Author: Daniel-Constantin Mierla
Committer: GitHub
Date: 2020-06-11T21:15:59+02:00
Merge pull request #2352 from kamailio/feature/keepalive-new-state-log-feedback
keepalive: logging state of dest just if changed
---
Modified: src/modules/keepalive/keepalive_core.c
---
Diff:
https://github.com/kamailio/kamailio/commit/f748835d507c9f2a7f231efa10ce65f42d77831d.diff
Patch:
https://github.com/kamailio/kamailio/commit/f748835d507c9f2a7f231efa10ce65f42d77831d.patch
---
diff --git a/src/modules/keepalive/keepalive_core.c
b/src/modules/keepalive/keepalive_core.c
index 4daa57908d..36cf81aef1 100644
--- a/src/modules/keepalive/keepalive_core.c
+++ b/src/modules/keepalive/keepalive_core.c
@@ -119,7 +119,6 @@ static void ka_options_callback(
ka_dest->counter++;
}
- LM_DBG("new state is: %d\n", state);
if(state != ka_dest->state) {
ka_run_route(msg, , state_routes[state]);
@@ -127,6 +126,7 @@ static void ka_options_callback(
ka_dest->statechanged_clb(_dest->uri, state,
ka_dest->user_attr);
}
+ LM_DBG("new state is: %d\n", state);
ka_dest->state = state;
}
if(ka_dest->response_clb != NULL) {
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:f8b09943: modules: readme files regenerated - modules ... [skip ci]
Module: kamailio Branch: 5.3 Commit: f8b099436b654515ef75c61acb1abb0fea53b62d URL: https://github.com/kamailio/kamailio/commit/f8b099436b654515ef75c61acb1abb0fea53b62d Author: Kamailio Dev Committer: Kamailio Dev Date: 2020-06-11T16:04:43+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua_sr/README Modified: src/modules/app_mono/README Modified: src/modules/app_perl/README Modified: src/modules/auth_radius/README Modified: src/modules/cdp_avp/README Modified: src/modules/dmq/README Modified: src/modules/domainpolicy/README Modified: src/modules/geoip/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/jansson/README Modified: src/modules/kemix/README Modified: src/modules/mqueue/README Modified: src/modules/msrp/README Modified: src/modules/mtree/README Modified: src/modules/path/README Modified: src/modules/pdb/README Modified: src/modules/permissions/README Modified: src/modules/pipelimit/README Modified: src/modules/presence_dialoginfo/README Modified: src/modules/presence_profile/README Modified: src/modules/ratelimit/README Modified: src/modules/sdpops/README Modified: src/modules/siputils/README Modified: src/modules/snmpstats/README Modified: src/modules/tmrec/README Modified: src/modules/uri_db/README Modified: src/modules/xhttp/README Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/f8b099436b654515ef75c61acb1abb0fea53b62d.diff Patch: https://github.com/kamailio/kamailio/commit/f8b099436b654515ef75c61acb1abb0fea53b62d.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git: new commits in branch 5.3
- URL: https://github.com/kamailio/kamailio/commit/51ba498700c239d1721534d01da65fa90e95d069 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:23:59+02:00 pv: use localtime_r() for a safer multi-thread usage (cherry picked from commit 14645b550cf9500e6a6e4a7d2ed8749e9aa174dc) - URL: https://github.com/kamailio/kamailio/commit/7307b51b439f2d1fde1cc959c9eabc786eb1558c Author: Daniel-Constantin Mierla Date: 2020-06-11T15:24:13+02:00 htable: use localtime_r() for a safer multi-thread usage (cherry picked from commit a6a4046757c2cac79455aa4a2d2ac632faa5e379) - URL: https://github.com/kamailio/kamailio/commit/6db082b757ef4552c254ba9974ed29fb8dd1a53c Author: Daniel-Constantin Mierla Date: 2020-06-11T15:25:43+02:00 core: events - increased SREV_CB_LIST_SIZE - there can be several modules registering for these core callbacks (cherry picked from commit fc7b0d65a227a176f79459c86844668bcd519148) - URL: https://github.com/kamailio/kamailio/commit/c4471752e9f5b75b553676e7a0c8e783c2608a6a Author: Daniel-Constantin Mierla Date: 2020-06-11T15:25:55+02:00 sipdump: safety check for local socket pointer - use generic address is not set (cherry picked from commit 3e969a5b4d9a75d082f7d59b0fa1dc6362391675) - URL: https://github.com/kamailio/kamailio/commit/ffc82295b14980283b88cac4793a3331788f413b Author: Daniel-Constantin Mierla Date: 2020-06-11T15:26:13+02:00 core: safer truncation of hostname using memcpy (cherry picked from commit aac577a4655ebf09d5cbef3e1a49f72d25ea57d7) - URL: https://github.com/kamailio/kamailio/commit/ea06c83da7a2d592b856c01c6677692d1311e3f9 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:26:48+02:00 core: udp server - add sockaddr_storage to ensure enough size for sockaddr_union - safety check that from addr len is matching expected size for listen socket - rename local variables to suggest better their purpose (cherry picked from commit d13f863e74c6c0275264e588f1dca206cf099587) - URL: https://github.com/kamailio/kamailio/commit/a6a7e9b57edef5794a96299ce77c27db5667e4b4 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:27:33+02:00 regex: leave enough space in buffers for parenthesis and -ending (cherry picked from commit 9cae069832c8f37ebf9e686b3fbcab5d63652755) - URL: https://github.com/kamailio/kamailio/commit/f1af2147c506b3c01c80dcc66d294481530fd957 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:28:19+02:00 imc: reserve last char in global buffer for ending zero (cherry picked from commit 702630b484ac6f7c017829c24294ce7552f1682a) - URL: https://github.com/kamailio/kamailio/commit/c27cad6e743083b56c38f8eaf87ddc43e68b5068 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:28:32+02:00 core: explicit cast to (void*) for %p format printing - c standard required that for a defined value and in some cases the code analysers complain, especially when reading the value via socket/file descriptor (cherry picked from commit 730f65c06d0b8436e4a9cd0c1a62d2433819dc45) - URL: https://github.com/kamailio/kamailio/commit/c90fb35fbd5091e929f8b3b5064d8fe9ef674487 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:28:45+02:00 misc: examples/kemi - small typo in lua example (cherry picked from commit c1d3fdb31871078b666278a933dbab20a0a8dca3) - URL: https://github.com/kamailio/kamailio/commit/4f9f7160511a5f9301e2fb5764d857f58eb8f95b Author: Daniel-Constantin Mierla Date: 2020-06-11T15:29:06+02:00 tm: safety checks for branch request len (cherry picked from commit c45913497f222c67bcccdbc8724b25bb083c556f) - URL: https://github.com/kamailio/kamailio/commit/129986178fb1e11e1e3132155445c16f7ba8ac78 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:29:53+02:00 evapi: cast to void* when printing logs with pointer value (cherry picked from commit 4ad790f697554332ea590793d3ec56e13437e82f) - URL: https://github.com/kamailio/kamailio/commit/88935e040472ac0b5633173dfcd97251c09fa5c2 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:30:04+02:00 pua_reginfo: free xml doc in case of error - a few whitespacing fixes (cherry picked from commit 7ae675bd90b4420ebaa17768c97aa09219f53116) - URL: https://github.com/kamailio/kamailio/commit/40e3773f28faf392475b142f54f301d7c0ec6f6e Author: Daniel-Constantin Mierla Date: 2020-06-11T15:30:49+02:00 outbound: pass recv info struct by address - fix performance inefficiency for passing large structs by value (cherry picked from commit 56ea88ef9a0628d7ca644f31840101ffe573e5c3) - URL: https://github.com/kamailio/kamailio/commit/8ca76f01711e59fd1567bfcbd785cb0b7b8b3942 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:30:59+02:00 path: updates for outboud module api (cherry picked from commit 97c7081df94eaabd8e48b084671ea831b5ec9024) - URL: https://github.com/kamailio/kamailio/commit/749dcc5b6d03889609685957538dc90bccce5703 Author: Daniel-Constantin Mierla Date: 2020-06-11T15:31:07+02:00 rr: updates for outboud module api (cherry picked from
[sr-dev] git:master:3f156be2: siputils: cotact ops - more debug info and coherence in log messages
Module: kamailio Branch: master Commit: 3f156be2e5e2c06a6716e709a246e57c51661012 URL: https://github.com/kamailio/kamailio/commit/3f156be2e5e2c06a6716e709a246e57c51661012 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2020-06-11T15:19:19+02:00 siputils: cotact ops - more debug info and coherence in log messages - use lowercase always at the start, the message is prefixed anyhow --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/3f156be2e5e2c06a6716e709a246e57c51661012.diff Patch: https://github.com/kamailio/kamailio/commit/3f156be2e5e2c06a6716e709a246e57c51661012.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:57545396: siputils: contact ops - clang format code
Module: kamailio Branch: master Commit: 5754539602bb6806f829a9ceee73630953fdaa81 URL: https://github.com/kamailio/kamailio/commit/5754539602bb6806f829a9ceee73630953fdaa81 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2020-06-11T14:07:35+02:00 siputils: contact ops - clang format code --- Modified: src/modules/siputils/contact_ops.c Modified: src/modules/siputils/contact_ops.h --- Diff: https://github.com/kamailio/kamailio/commit/5754539602bb6806f829a9ceee73630953fdaa81.diff Patch: https://github.com/kamailio/kamailio/commit/5754539602bb6806f829a9ceee73630953fdaa81.patch ___ 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] How to resolve these mod_param errors in Kamailio 5.3.1? More info below: (#2355)
This is a question for sr-us...@lists.kamailio.org, not being related to a bug in kamailio code, but how to use and configure kamailio. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2355#issuecomment-642610585___ 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] How to resolve these mod_param errors in Kamailio 5.3.1? More info below: (#2355)
@linuxmaniac Please reopen. I still can't find the other 3 params. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2355#issuecomment-642607916___ 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] How to resolve these mod_param errors in Kamailio 5.3.1? More info below: (#2355)
Closed #2355. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2355#event-3433886403___ 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] How to resolve these mod_param errors in Kamailio 5.3.1? More info below: (#2355)
Thank you for responding. I have found one of the new avp, but can't find the
other three: grp_avp, cnt_avp, and sock_avp
> Take a look at the new param:
> https://kamailio.org/docs/modules/5.3.x/modules/dispatcher.html#dispatcher.p.xavp_dst
> Up to version 5.2, regular AVPs were used, but starting with version 5.3 the
> regular AVPs were replaced by an XAVP. Regards, Ovidiu Sas
> On Thu, Jun 11, 2020 at 04:48 MaabSaleeem ***@***.***> wrote: This is the
> error I get when I run ./kamailio -f /etc/kamailio/kamailio.cfg -E
> -- loading modules under config path:
> /usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/:/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/
> 0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
> of type <1> not found in module 0(28369) CRITICAL:
> [core/cfg.y:3539]: yyerror_at(): parse error in config file
> /etc/kamailio/kamailio.cfg, line 378, column 61: Can't set module parameter
> 0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
> of type <1> not found in module 0(28369) CRITICAL:
> [core/cfg.y:3539]: yyerror_at(): parse error in config file
> /etc/kamailio/kamailio.cfg, line 379, column 61: Can't set module parameter
> 0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
> of type <1> not found in module 0(28369) CRITICAL:
> [core/cfg.y:3539]: yyerror_at(): parse error in config file
> /etc/kamailio/kamailio.cfg, line 380, column 61: Can't set module parameter
> 0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
> of type <1> not found in module 0(28369) CRITICAL:
> [core/cfg.y:3539]: yyerror_at(): parse error in config file
> /etc/kamailio/kamailio.cfg, line 381, column 63: Can't set module parameter
> ERROR: bad config file (4 errors) -- These are
> the lines 378-381 from the config file modparam("dispatcher", "dst_avp",
> "$avp(DISPATCHER_DST_AVP)") modparam("dispatcher", "grp_avp",
> "$avp(DISPATCHER_GRP_AVP)") modparam("dispatcher", "cnt_avp",
> "$avp(DISPATCHER_CNT_AVP)") modparam("dispatcher", "sock_avp",
> "$avp(DISPATCHER_SOCK_AVP)") — You are receiving this because you are
> subscribed to this thread. Reply to this email directly, view it on GitHub
> <#2355>, or unsubscribe
>
> . ___ Kamailio (SER) -
> Development Mailing List ***@***.***
> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
> -- VoIP Embedded, Inc. http://www.voipembedded.com
--
You are receiving this because you commented.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/2355#issuecomment-642606859___
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] How to resolve these mod_param errors in Kamailio 5.3.1? More info below: (#2355)
Take a look at the new param:
https://kamailio.org/docs/modules/5.3.x/modules/dispatcher.html#dispatcher.p.xavp_dst
Up to version 5.2, regular AVPs were used, but starting with version 5.3
the regular AVPs were replaced by an XAVP.
Regards,
Ovidiu Sas
On Thu, Jun 11, 2020 at 04:48 MaabSaleeem wrote:
> This is the error I get when I run ./kamailio -f
> /etc/kamailio/kamailio.cfg -E
> --
>
> loading modules under config path:
> /usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/:/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/
> 0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
> of type <1> not found in module
> 0(28369) CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config
> file /etc/kamailio/kamailio.cfg, line 378, column 61: Can't set module
> parameter
> 0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
> of type <1> not found in module
> 0(28369) CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config
> file /etc/kamailio/kamailio.cfg, line 379, column 61: Can't set module
> parameter
> 0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
> of type <1> not found in module
> 0(28369) CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config
> file /etc/kamailio/kamailio.cfg, line 380, column 61: Can't set module
> parameter
> 0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
> of type <1> not found in module
> 0(28369) CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config
> file /etc/kamailio/kamailio.cfg, line 381, column 63: Can't set module
> parameter
> ERROR: bad config file (4 errors)
> --
>
> These are the lines 378-381 from the config file
>
> modparam("dispatcher", "dst_avp", "$avp(DISPATCHER_DST_AVP)")
> modparam("dispatcher", "grp_avp", "$avp(DISPATCHER_GRP_AVP)")
> modparam("dispatcher", "cnt_avp", "$avp(DISPATCHER_CNT_AVP)")
> modparam("dispatcher", "sock_avp", "$avp(DISPATCHER_SOCK_AVP)")
>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub
> , or unsubscribe
>
> .
> ___
> Kamailio (SER) - Development Mailing List
> sr-dev@lists.kamailio.org
> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
>
--
VoIP Embedded, Inc.
http://www.voipembedded.com
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:2b8b2904: siputils: contact ops - removed old defines set on for very long time
Module: kamailio Branch: master Commit: 2b8b2904399478984d3983ce447c98832419570a URL: https://github.com/kamailio/kamailio/commit/2b8b2904399478984d3983ce447c98832419570a Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2020-06-11T13:28:39+02:00 siputils: contact ops - removed old defines set on for very long time - bits of formatting code and comments --- Modified: src/modules/siputils/contact_ops.c Modified: src/modules/siputils/contact_ops.h --- Diff: https://github.com/kamailio/kamailio/commit/2b8b2904399478984d3983ce447c98832419570a.diff Patch: https://github.com/kamailio/kamailio/commit/2b8b2904399478984d3983ce447c98832419570a.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:2ac50d04: tm: convert to PKG/SHM memory logging helper functions
Module: kamailio Branch: master Commit: 2ac50d041fb2d9a32e339f02448e5daa202da65e URL: https://github.com/kamailio/kamailio/commit/2ac50d041fb2d9a32e339f02448e5daa202da65e Author: Henning Westerholt Committer: Henning Westerholt Date: 2020-06-11T11:03:32Z tm: convert to PKG/SHM memory logging helper functions --- Modified: src/modules/tm/dlg.c Modified: src/modules/tm/h_table.c Modified: src/modules/tm/rpc_uac.c Modified: src/modules/tm/t_fifo.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_serial.c Modified: src/modules/tm/t_stats.c Modified: src/modules/tm/test.c --- Diff: https://github.com/kamailio/kamailio/commit/2ac50d041fb2d9a32e339f02448e5daa202da65e.diff Patch: https://github.com/kamailio/kamailio/commit/2ac50d041fb2d9a32e339f02448e5daa202da65e.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:3b0cbc30: modules: readme files regenerated - modules ... [skip ci]
Module: kamailio Branch: 5.3 Commit: 3b0cbc3002280b21e0e77769276eeaf1a7a3af6c URL: https://github.com/kamailio/kamailio/commit/3b0cbc3002280b21e0e77769276eeaf1a7a3af6c Author: Kamailio Dev Committer: Kamailio Dev Date: 2020-06-11T13:01:33+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/3b0cbc3002280b21e0e77769276eeaf1a7a3af6c.diff Patch: https://github.com/kamailio/kamailio/commit/3b0cbc3002280b21e0e77769276eeaf1a7a3af6c.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:ba8effcc: modules: readme files regenerated - modules ... [skip ci]
Module: kamailio Branch: 5.2 Commit: ba8effcc6189404d368543215b8aa992f41b8d3b URL: https://github.com/kamailio/kamailio/commit/ba8effcc6189404d368543215b8aa992f41b8d3b Author: Kamailio Dev Committer: Kamailio Dev Date: 2020-06-11T12:47:04+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/ba8effcc6189404d368543215b8aa992f41b8d3b.diff Patch: https://github.com/kamailio/kamailio/commit/ba8effcc6189404d368543215b8aa992f41b8d3b.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:8b0cd13f: ims_charging: fix errors in docs, add missing parameters
Module: kamailio Branch: 5.3 Commit: 8b0cd13f0dc08f9f4ecb0d9b716d651ff23ae2f3 URL: https://github.com/kamailio/kamailio/commit/8b0cd13f0dc08f9f4ecb0d9b716d651ff23ae2f3 Author: Henning Westerholt Committer: Henning Westerholt Date: 2020-06-11T10:46:21Z ims_charging: fix errors in docs, add missing parameters (cherry picked from commit d4f3d0e705f38c61c842c5f6a367a9768e592965) --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8b0cd13f0dc08f9f4ecb0d9b716d651ff23ae2f3.diff Patch: https://github.com/kamailio/kamailio/commit/8b0cd13f0dc08f9f4ecb0d9b716d651ff23ae2f3.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:4ca96224: modules: readme files regenerated - ims_charging ... [skip ci]
Module: kamailio Branch: master Commit: 4ca962240d90f751371475a02ff404c19c8027da URL: https://github.com/kamailio/kamailio/commit/4ca962240d90f751371475a02ff404c19c8027da Author: Kamailio Dev Committer: Kamailio Dev Date: 2020-06-11T12:46:14+02:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/4ca962240d90f751371475a02ff404c19c8027da.diff Patch: https://github.com/kamailio/kamailio/commit/4ca962240d90f751371475a02ff404c19c8027da.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:5a57dfd5: ims_charging: fix errors in docs, add missing parameters
Module: kamailio Branch: 5.2 Commit: 5a57dfd53cf1118609c947e1ef7a2bdd9a3597db URL: https://github.com/kamailio/kamailio/commit/5a57dfd53cf1118609c947e1ef7a2bdd9a3597db Author: Henning Westerholt Committer: Henning Westerholt Date: 2020-06-11T10:46:06Z ims_charging: fix errors in docs, add missing parameters (cherry picked from commit d4f3d0e705f38c61c842c5f6a367a9768e592965) --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a57dfd53cf1118609c947e1ef7a2bdd9a3597db.diff Patch: https://github.com/kamailio/kamailio/commit/5a57dfd53cf1118609c947e1ef7a2bdd9a3597db.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:d4f3d0e7: ims_charging: fix errors in docs, add missing parameters
Module: kamailio Branch: master Commit: d4f3d0e705f38c61c842c5f6a367a9768e592965 URL: https://github.com/kamailio/kamailio/commit/d4f3d0e705f38c61c842c5f6a367a9768e592965 Author: Henning Westerholt Committer: Henning Westerholt Date: 2020-06-11T10:45:33Z ims_charging: fix errors in docs, add missing parameters --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d4f3d0e705f38c61c842c5f6a367a9768e592965.diff Patch: https://github.com/kamailio/kamailio/commit/d4f3d0e705f38c61c842c5f6a367a9768e592965.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:9de86263: ims_charging: add structured debug logging for key functions
Module: kamailio Branch: master Commit: 9de8626307076edf3a76ee2564c245d92c11a0ce URL: https://github.com/kamailio/kamailio/commit/9de8626307076edf3a76ee2564c245d92c11a0ce Author: Henning Westerholt Committer: Henning Westerholt Date: 2020-06-11T10:45:33Z ims_charging: add structured debug logging for key functions --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/9de8626307076edf3a76ee2564c245d92c11a0ce.diff Patch: https://github.com/kamailio/kamailio/commit/9de8626307076edf3a76ee2564c245d92c11a0ce.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:53f9992e: cdp: small (commented out) debugging helper
Module: kamailio
Branch: master
Commit: 53f9992e1a0b646744f9ddc626d002306ed4db60
URL:
https://github.com/kamailio/kamailio/commit/53f9992e1a0b646744f9ddc626d002306ed4db60
Author: Henning Westerholt
Committer: Henning Westerholt
Date: 2020-06-11T10:45:33Z
cdp: small (commented out) debugging helper
---
Modified: src/modules/cdp/diameter_msg.c
---
Diff:
https://github.com/kamailio/kamailio/commit/53f9992e1a0b646744f9ddc626d002306ed4db60.diff
Patch:
https://github.com/kamailio/kamailio/commit/53f9992e1a0b646744f9ddc626d002306ed4db60.patch
---
diff --git a/src/modules/cdp/diameter_msg.c b/src/modules/cdp/diameter_msg.c
index 464a3504e1..605109ae41 100644
--- a/src/modules/cdp/diameter_msg.c
+++ b/src/modules/cdp/diameter_msg.c
@@ -76,6 +76,7 @@ AAAReturnCode AAABuildMsgBuffer( AAAMessage *msg )
/* count and add the avps */
for(avp=msg->avpList.head;avp;avp=avp->next) {
msg->buf.len += AVP_HDR_SIZE(avp->flags)+ to_32x_len(
avp->data.len );
+ //LM_DBG("AVP code: %d, data %.*s\n", avp->code, avp->data.len,
avp->data.s);
}
LM_DBG("AAABuildMsgBuffer(): len=%d\n",msg->buf.len);
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:289e3470: modules: readme files regenerated - acc ... [skip ci]
Module: kamailio Branch: master Commit: 289e347054c18da6548101703d971099094165d5 URL: https://github.com/kamailio/kamailio/commit/289e347054c18da6548101703d971099094165d5 Author: Kamailio Dev Committer: Kamailio Dev Date: 2020-06-11T10:46:32+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/289e347054c18da6548101703d971099094165d5.diff Patch: https://github.com/kamailio/kamailio/commit/289e347054c18da6548101703d971099094165d5.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] How to resolve these mod_param errors in Kamailio 5.3.1? More info below: (#2355)
This is the error I get when I run ./kamailio -f /etc/kamailio/kamailio.cfg -E
---
loading modules under config path:
/usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/:/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/
0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
of type <1> not found in module
0(28369) CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in
config file /etc/kamailio/kamailio.cfg, line 378, column 61: Can't set module
parameter
0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
of type <1> not found in module
0(28369) CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in
config file /etc/kamailio/kamailio.cfg, line 379, column 61: Can't set module
parameter
0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
of type <1> not found in module
0(28369) CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in
config file /etc/kamailio/kamailio.cfg, line 380, column 61: Can't set module
parameter
0(28369) ERROR: [core/modparam.c:140]: set_mod_param_regex(): parameter
of type <1> not found in module
0(28369) CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in
config file /etc/kamailio/kamailio.cfg, line 381, column 63: Can't set module
parameter
ERROR: bad config file (4 errors)
--
These are the lines 378-381 from the config file
modparam("dispatcher", "dst_avp", "$avp(DISPATCHER_DST_AVP)")
modparam("dispatcher", "grp_avp", "$avp(DISPATCHER_GRP_AVP)")
modparam("dispatcher", "cnt_avp", "$avp(DISPATCHER_CNT_AVP)")
modparam("dispatcher", "sock_avp", "$avp(DISPATCHER_SOCK_AVP)")
--
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/2355___
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] acc: new skip_cdr modparam to prevent cdr generation (#2351)
Thanks again -- 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/2351#issuecomment-642503455___ 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] acc: new skip_cdr modparam to prevent cdr generation (#2351)
Merged #2351 into master. -- 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/2351#event-3433117687___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:7bedc588: acc: new skip_cdr modparam to prevent cdr generation
Module: kamailio
Branch: master
Commit: 7bedc5885134bb340b75a263d822617831e4af99
URL:
https://github.com/kamailio/kamailio/commit/7bedc5885134bb340b75a263d822617831e4af99
Author: Carlos Cruz
Committer: Henning Westerholt
Date: 2020-06-11T10:42:12+02:00
acc: new skip_cdr modparam to prevent cdr generation
This commit adds a new modparam called cdr_skip to acc module that allows
excluding certain calls from CDRs in Kamailio route logic.
Dialogs ended with chosen dlg_var set (no matter the value) won't generate
a CDR (both database and log) even though cdr_enable modparam is set.
---
Modified: src/modules/acc/acc_cdr.c
Modified: src/modules/acc/acc_mod.c
Modified: src/modules/acc/acc_mod.h
Modified: src/modules/acc/doc/acc_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/7bedc5885134bb340b75a263d822617831e4af99.diff
Patch:
https://github.com/kamailio/kamailio/commit/7bedc5885134bb340b75a263d822617831e4af99.patch
---
diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c
index d59192156a..52c904a50f 100644
--- a/src/modules/acc/acc_cdr.c
+++ b/src/modules/acc/acc_cdr.c
@@ -392,6 +392,16 @@ static int write_cdr( struct dlg_cell* dialog,
return -1;
}
+ /* Skip cdr if cdr_skip dlg_var exists */
+ if (cdr_skip.len > 0) {
+ str* nocdr_val = 0;
+ nocdr_val = dlgb.get_dlg_var( dialog, _skip);
+ if ( nocdr_val ){
+ LM_DBG( "cdr_skip dlg_var set, skip cdr!");
+ return 0;
+ }
+ }
+
ret = log_write_cdr(dialog, message);
ret |= db_write_cdr(dialog, message);
return ret;
diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c
index 0b04f3e82c..27feb847db 100644
--- a/src/modules/acc/acc_mod.c
+++ b/src/modules/acc/acc_mod.c
@@ -121,6 +121,7 @@ int cdr_start_on_confirmed = 0;
int cdr_expired_dlg_enable = 0;
static char* cdr_facility_str = 0;
static char* cdr_log_extra_str = 0;
+str cdr_skip = {NULL, 0};
str cdr_start_str = str_init("start_time");
str cdr_end_str = str_init("end_time");
@@ -206,6 +207,7 @@ static param_export_t params[] = {
{"log_extra",PARAM_STRING, _extra_str},
/* cdr specific */
{"cdr_enable", INT_PARAM, _enable },
+ {"cdr_skip", PARAM_STR, _skip },
{"cdr_log_enable", INT_PARAM, _log_enable },
{"cdr_start_on_confirmed", INT_PARAM, _start_on_confirmed },
{"cdr_facility", PARAM_STRING, _facility_str },
diff --git a/src/modules/acc/acc_mod.h b/src/modules/acc/acc_mod.h
index a28721cdea..b25c9d4a17 100644
--- a/src/modules/acc/acc_mod.h
+++ b/src/modules/acc/acc_mod.h
@@ -53,6 +53,7 @@ extern int cdr_extra_nullable;
extern int cdr_start_on_confirmed;
extern int cdr_log_facility;
extern int cdr_expired_dlg_enable;
+extern str cdr_skip;
extern int db_flag;
extern int db_missed_flag;
diff --git a/src/modules/acc/doc/acc_admin.xml
b/src/modules/acc/doc/acc_admin.xml
index f47a92a689..a990db04a4 100644
--- a/src/modules/acc/doc/acc_admin.xml
+++ b/src/modules/acc/doc/acc_admin.xml
@@ -1034,6 +1034,23 @@ modparam("acc", "db_insert_mode", 1)
...
modparam("acc", "cdr_enable", 1)
...
+
+
+
+
+ cdr_skip (string)
+
+ Skip cdr generation for dialogs with this dlg_var set.
+
+
+ Default value is NULL.
+
+
+ cdr_skip example
+
+...
+modparam("acc", "cdr_skip", "nocdr")
+...
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
