[sr-dev] git:master:83f2dd24: dispatcher: return oc seq, min and max attrs in rpc list
Module: kamailio
Branch: master
Commit: 83f2dd24e404eead32361079fca1fd68976e81c8
URL:
https://github.com/kamailio/kamailio/commit/83f2dd24e404eead32361079fca1fd68976e81c8
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2024-07-31T16:07:17+02:00
dispatcher: return oc seq, min and max attrs in rpc list
---
Modified: src/modules/dispatcher/dispatcher.c
---
Diff:
https://github.com/kamailio/kamailio/commit/83f2dd24e404eead32361079fca1fd68976e81c8.diff
Patch:
https://github.com/kamailio/kamailio/commit/83f2dd24e404eead32361079fca1fd68976e81c8.patch
---
diff --git a/src/modules/dispatcher/dispatcher.c
b/src/modules/dispatcher/dispatcher.c
index 5d61d00ffd8..440b4b96030 100644
--- a/src/modules/dispatcher/dispatcher.c
+++ b/src/modules/dispatcher/dispatcher.c
@@ -1869,14 +1869,15 @@ int ds_rpc_print_set(
ipbuf[0] = '\0';
ip_addr2sbufz(
&node->dlist[j].ip_address, ipbuf,
IP_ADDR_MAX_STRZ_SIZE);
- if(rpc->struct_add(vh, "Ssddjjujjj", "HOST",
&node->dlist[j].host,
+ if(rpc->struct_add(vh, "Ssddjju", "HOST",
&node->dlist[j].host,
"IPADDR", ipbuf, "PORT",
(int)node->dlist[j].port,
"PROTOID",
(int)node->dlist[j].proto, "DNSTIME_SEC",
(unsigned
long)node->dlist[j].dnstime.tv_sec,
"DNSTIME_USEC",
(unsigned
long)node->dlist[j].dnstime.tv_usec, "OCRATE",
node->dlist[j].attrs.ocrate, "OCIDX",
- (unsigned long)node->dlist[j].ocidx,
"OCTIME_SEC",
+ (unsigned long)node->dlist[j].ocidx,
"OCSEQ",
+ (unsigned long)node->dlist[j].ocseq,
"OCTIME_SEC",
(unsigned
long)node->dlist[j].octime.tv_sec,
"OCTIME_USEC",
(unsigned
long)node->dlist[j].octime.tv_usec)
@@ -1892,7 +1893,7 @@ int ds_rpc_print_set(
rpc->fault(ctx, 500, "Internal error creating
dest struct");
return -1;
}
- if(rpc->struct_add(wh, "SSdddSSS", "BODY",
+ if(rpc->struct_add(wh, "SSdddSSSjj", "BODY",
&(node->dlist[j].attrs.body), "DUID",
(node->dlist[j].attrs.duid.s)
?
&(node->dlist[j].attrs.duid)
@@ -1910,7 +1911,9 @@ int ds_rpc_print_set(
"OBPROXY",
(node->dlist[j].attrs.obproxy.s)
?
&(node->dlist[j].attrs.obproxy)
- : &data)
+ : &data,
+ "OCMIN", node->dlist[j].attrs.ocmin,
"OCMAX",
+ node->dlist[j].attrs.ocmax)
< 0) {
rpc->fault(ctx, 500, "Internal error creating
attrs struct");
return -1;
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:41016d18: dispatcher: range checks for oc rate min/max limits
Module: kamailio
Branch: master
Commit: 41016d1835c1ab62b7d3c0f6299fae727a6f7ed3
URL:
https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae727a6f7ed3
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2024-07-31T15:57:01+02:00
dispatcher: range checks for oc rate min/max limits
---
Modified: src/modules/dispatcher/dispatch.c
---
Diff:
https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae727a6f7ed3.diff
Patch:
https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae727a6f7ed3.patch
---
diff --git a/src/modules/dispatcher/dispatch.c
b/src/modules/dispatcher/dispatch.c
index 8295145da0f..5e6f7da8926 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -411,9 +411,15 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs)
if(dest->attrs.ocmax > 100) {
dest->attrs.ocmax = 100;
}
+ if(dest->attrs.ocmax <= 0) {
+ dest->attrs.ocmax = 100;
+ }
if(dest->attrs.ocmin > 100) {
dest->attrs.ocmin = 0;
}
+ if(dest->attrs.ocmin < 0) {
+ dest->attrs.ocmin = 0;
+ }
if(dest->attrs.ocrate > 100) {
dest->attrs.ocrate = 0;
}
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:08ee7330: dispatcher: intit oc rate max limit
Module: kamailio
Branch: master
Commit: 08ee7330922e9e2b4d8fd8d5f63f596c84e2c81c
URL:
https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596c84e2c81c
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2024-07-31T15:50:45+02:00
dispatcher: intit oc rate max limit
---
Modified: src/modules/dispatcher/dispatch.c
---
Diff:
https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596c84e2c81c.diff
Patch:
https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596c84e2c81c.patch
---
diff --git a/src/modules/dispatcher/dispatch.c
b/src/modules/dispatcher/dispatch.c
index bdb615ad3ea..8295145da0f 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -603,6 +603,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str
*attrs, int dload)
dp->flags = flags;
dp->priority = priority;
dp->dload = dload;
+ dp->attrs.ocmax = 100;
if(ds_set_attrs(dp, attrs) < 0) {
LM_ERR("cannot set attributes!\n");
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:604fd278: dispatcher: always return attrs in rpc list full mode
Module: kamailio
Branch: master
Commit: 604fd2787620de87585ba17fb6a6961b3b999331
URL:
https://github.com/kamailio/kamailio/commit/604fd2787620de87585ba17fb6a6961b3b999331
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2024-07-31T16:01:38+02:00
dispatcher: always return attrs in rpc list full mode
---
Modified: src/modules/dispatcher/dispatcher.c
---
Diff:
https://github.com/kamailio/kamailio/commit/604fd2787620de87585ba17fb6a6961b3b999331.diff
Patch:
https://github.com/kamailio/kamailio/commit/604fd2787620de87585ba17fb6a6961b3b999331.patch
---
diff --git a/src/modules/dispatcher/dispatcher.c
b/src/modules/dispatcher/dispatcher.c
index 74ee7cc8e8d..5d61d00ffd8 100644
--- a/src/modules/dispatcher/dispatcher.c
+++ b/src/modules/dispatcher/dispatcher.c
@@ -1886,7 +1886,8 @@ int ds_rpc_print_set(
}
}
- if(mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s !=
NULL) {
+ if((mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s
!= NULL)
+ || (mode == DS_RPC_PRINT_FULL)) {
if(rpc->struct_add(vh, "{", "ATTRS", &wh) < 0) {
rpc->fault(ctx, 500, "Internal error creating
dest struct");
return -1;
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] msrp: add frame forward (PR #3934)
For our needs, we have a similar functionality to proxy MSRP messages. In our experience, some clients do not support IPv6 addresses, and if Kamailio received an MSRP message using an IPv6 address in the To header, then the forwarded message will be with IPv6 address From the header. Such clients will not be able to parse MSRP messages. Also if another server can parse IPv6 addresses but does not have connectivity to IPv6 and Kamailio send From with IPv6 address, then this server was not able to respond because does not have connectivity to IPv6 network. Some workaround is possible but in general, Kamailio as an MSRP proxy should use IP address of the outbound interface. Not the From header of the received MSRP message. On another question. How do you solve SDP message change? We made this by writing the Kamailio route, but it is not simple for understanding and support. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3934#issuecomment-2260637179 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] msrp: add frame forward (PR #3934)
With the ability to replace the To-Path and From-Path headers and as long you replace both, you can relay between IPv4 and IPv6 with no problem. As for the SDP, I did it in the routing script (using Lua), I used the sdpops.sdp_get_line_startswith to get the original path and textops.subst_body to replace the path and connection ip/port. I also recorded each session and respective replacement paths in htable vars (INVITE and on-reply callback). I use the Session-Expires header to set the expires for the htable stored data. Then on the MSRP route I fetch the stored data in htable data (using the session as key) to get the replace paths and call forward. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3934#issuecomment-2260847645 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] siptrace: handle trace_to_database param at runtime (PR #3877)
This PR is stale because it has been open 6 weeks with no activity. Remove stale label or comment or this will be closed in 2 weeks. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3877#issuecomment-2261855160 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] msrp: add frame forward (PR #3934)
Thanks, merging! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3934#issuecomment-2262066096 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] msrp: add frame forward (PR #3934)
Merged #3934 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3934#event-13719881565 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:aa417aca: msrp: add forward support with path replacement
Module: kamailio Branch: master Commit: aa417aca610b1c8a623847c22d9becba9a343241 URL: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becba9a343241 Author: Bruno Santos Committer: Daniel-Constantin Mierla Date: 2024-08-01T07:25:21+02:00 msrp: add forward support with path replacement - add function to allow forwarding of MSRP frames with optional To/From-Path replacement --- Modified: src/modules/msrp/doc/msrp_admin.xml Modified: src/modules/msrp/msrp_mod.c Modified: src/modules/msrp/msrp_netio.c Modified: src/modules/msrp/msrp_netio.h --- Diff: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becba9a343241.diff Patch: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becba9a343241.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:e273fc10: modules: readme files regenerated - msrp ... [skip ci]
Module: kamailio Branch: master Commit: e273fc10d65b41a407797fef0f9953c1615a88a2 URL: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c1615a88a2 Author: Kamailio Dev Committer: Kamailio Dev Date: 2024-08-01T07:31:11+02:00 modules: readme files regenerated - msrp ... [skip ci] --- Modified: src/modules/msrp/README --- Diff: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c1615a88a2.diff Patch: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c1615a88a2.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] core: local TCP socket is bound on listening address (PR #3925)
@ivanuschak - related to: ``` - *from = &si->su; + memcpy(*from, &si->su, sockaddru_len(si->su)); ``` What I wanted to comment about is that the size are different between the pointer to a structure and the structure itself. A pointer is 4 bytes on 32bit CPU and 8 bytes on 64bit CPU. So the `&si->su` is a pointer (address), being 4/8bytes, `*from` is written with 4/8 bytes. The change makes the `*from` to be written with `sockaddru_len(si->su)` bytes. Is this correct in the way that `*from` has the proper reserved/allocated size? For me it feels incorrect, the `struct sockaddr_in6` is more than 8 bytes: - https://man7.org/linux/man-pages/man7/ipv6.7.html -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3925#issuecomment-2262083198 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] siptrace: handle trace_to_database param at runtime (PR #3877)
Somehow this got out of focus, but reviewing agan, I can't see how this is
working unless kamailio is started with:
```
modparam("siptrace", "trace_to_database", 1)
```
so every Kamailio worker process get the connection to database initialized at
startup. Then tracing to database can be disabled/(re-)enabled during runtime.
With this PR, if trace_to_database=0 at startup, then the global static db_con
is NULL for worker processes and the RPC command initializes it only for the
RPC process, it cannot do it for all the other Kamailio processes. There,
db_con stays NULL, eventually resulting in crashes or not writing to database.
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3877#issuecomment-2262099008
You are receiving this because you are subscribed to this thread.
Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:5f4f1f02: permissions: fixup uint support in address table reload
Module: kamailio
Branch: master
Commit: 5f4f1f027132a1e4cdc2528a0d65e777a0a01da7
URL:
https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e777a0a01da7
Author: Tyler Moore
Committer: Daniel-Constantin Mierla
Date: 2024-08-01T08:02:09+02:00
permissions: fixup uint support in address table reload
- add support for converting unsigned integer values directly,
in address table rpc reload.
---
Modified: src/modules/permissions/address.c
---
Diff:
https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e777a0a01da7.diff
Patch:
https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e777a0a01da7.patch
---
diff --git a/src/modules/permissions/address.c
b/src/modules/permissions/address.c
index c05811f73f9..3f825fba010 100644
--- a/src/modules/permissions/address.c
+++ b/src/modules/permissions/address.c
@@ -192,41 +192,49 @@ int reload_address_db_table(address_tables_group_t *atg)
ROW_N(row + i));
goto dberror;
}
- if((VAL_TYPE(val) != DB1_INT) || VAL_NULL(val) || (VAL_INT(val)
<= 0)) {
+ if((VAL_TYPE(val) != DB1_INT && VAL_TYPE(val) != DB1_UINT)
+ || VAL_NULL(val) || (VAL_INT(val) <= 0)) {
LM_DBG("failure during checks of database value 1
(group) in "
"address table\n");
goto dberror;
}
- if((VAL_TYPE(val + 1) != DB1_STRING)
- && (VAL_TYPE(val + 1) != DB1_STR)) {
+ if((VAL_TYPE(val + 1) != DB1_STRING && VAL_TYPE(val + 1) !=
DB1_STR)
+ || VAL_NULL(val + 1)) {
LM_DBG("failure during checks of database value 2 (IP
address) in "
- "address table - not a string value\n");
- goto dberror;
- }
- if(VAL_NULL(val + 1)) {
- LM_DBG("failure during checks of database value 2 (IP
address) in "
- "address table - NULL value not
permitted\n");
+ "address table\n");
goto dberror;
}
- if((VAL_TYPE(val + 2) != DB1_INT) || VAL_NULL(val + 2)) {
+ if((VAL_TYPE(val + 2) != DB1_INT && VAL_TYPE(val + 2) !=
DB1_UINT)
+ || VAL_NULL(val + 2)) {
LM_DBG("failure during checks of database value 3
(subnet "
"size/CIDR) in address table\n");
goto dberror;
}
- if((VAL_TYPE(val + 3) != DB1_INT) || VAL_NULL(val + 3)) {
+ if((VAL_TYPE(val + 3) != DB1_INT && VAL_TYPE(val + 3) !=
DB1_UINT)
+ || VAL_NULL(val + 3)) {
LM_DBG("failure during checks of database value 4
(port) in "
"address table\n");
goto dberror;
}
+ if(VAL_TYPE(val + 4) != DB1_STRING && VAL_TYPE(val + 4) !=
DB1_STR) {
+ LM_DBG("failure during checks of database value 5 (tag)
in address "
+ "table\n");
+ goto dberror;
+ }
+
gid = VAL_UINT(val);
ips.s = (char *)VAL_STRING(val + 1);
ips.len = strlen(ips.s);
mask = VAL_UINT(val + 2);
port = VAL_UINT(val + 3);
- tagv.s = VAL_NULL(val + 4) ? NULL : (char *)VAL_STRING(val + 4);
- if(tagv.s != NULL) {
+ if(VAL_NULL(val + 4)) {
+ tagv.s = NULL;
+ tagv.len = 0;
+ } else {
+ tagv.s = (char *)VAL_STRING(val + 4);
tagv.len = strlen(tagv.s);
}
+
if(reload_address_insert(atg, gid, &ips, mask, port, &tagv) <
0) {
goto dberror;
}
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:772f261f: htable: add uint support when packing an htable
Module: kamailio
Branch: master
Commit: 772f261f91685583af3db7cee2c227336eef7c42
URL:
https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c227336eef7c42
Author: Tyler Moore
Committer: Daniel-Constantin Mierla
Date: 2024-08-01T08:02:09+02:00
htable: add uint support when packing an htable
- add support for packing unsigned integer values from DB,
into hash tables.
---
Modified: src/modules/htable/ht_db.c
---
Diff:
https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c227336eef7c42.diff
Patch:
https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c227336eef7c42.patch
---
diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c
index 7a22ff6c484..8b0c667411d 100644
--- a/src/modules/htable/ht_db.c
+++ b/src/modules/htable/ht_db.c
@@ -132,6 +132,8 @@ static int ht_pack_values(
len += RES_ROWS(db_res)[row].values[c].val.blob_val.len;
} else if(RES_ROWS(db_res)[row].values[c].type == DB1_INT) {
len += 12;
+ } else if(RES_ROWS(db_res)[row].values[c].type == DB1_UINT) {
+ len += 12;
} else {
LM_ERR("unsupported data type for column %d\n", c);
return -1;
@@ -165,6 +167,11 @@ static int ht_pack_values(
RES_ROWS(db_res)[row].values[c].val.int_val, &iv.len);
strncpy(p, iv.s, iv.len);
p += iv.len;
+ } else if(RES_ROWS(db_res)[row].values[c].type == DB1_UINT) {
+ iv.s = int2str(
+
RES_ROWS(db_res)[row].values[c].val.uint_val, &iv.len);
+ strncpy(p, iv.s, iv.len);
+ p += iv.len;
}
if(c + 1 < cols) {
*p = ht->pack[1];
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:d90101e1: lib/srdb1: add uint support for db->pv conversions
Module: kamailio Branch: master Commit: d90101e1a50ef0c958e8e8a2f361198a28ea336a URL: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198a28ea336a Author: Tyler Moore Committer: Daniel-Constantin Mierla Date: 2024-08-01T08:02:09+02:00 lib/srdb1: add uint support for db->pv conversions - add support for converting unsigned integers into PVs. --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198a28ea336a.diff Patch: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198a28ea336a.patch --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index 9975672aeea..76210d5691e 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -596,6 +596,10 @@ int db_val2pv_spec(struct sip_msg *msg, db_val_t *dbval, pv_spec_t *pvs) pv.flags = PV_VAL_INT | PV_TYPE_INT; pv.ri = (long)dbval->val.int_val; break; + case DB1_UINT: + pv.flags = PV_VAL_INT | PV_TYPE_INT; + pv.ri = (long)dbval->val.uint_val; + break; case DB1_DATETIME: pv.flags = PV_VAL_INT | PV_TYPE_INT; pv.ri = (long)dbval->val.time_val; ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] multiple subsytems: unsigned integer conversion fixes (PR #3828)
Merged #3828 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3828#event-13720168308 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:6b413cc8: permissions: reworked condition checking group id on db load
Module: kamailio
Branch: master
Commit: 6b413cc8c7f9c6db019c98a28ab07cf902ef505e
URL:
https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf902ef505e
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2024-08-01T08:09:34+02:00
permissions: reworked condition checking group id on db load
- ensure it is not null and greater than 0 for both types
- update of 6afab49
---
Modified: src/modules/permissions/address.c
---
Diff:
https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf902ef505e.diff
Patch:
https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf902ef505e.patch
---
diff --git a/src/modules/permissions/address.c
b/src/modules/permissions/address.c
index 3f825fba010..05f56d3dc68 100644
--- a/src/modules/permissions/address.c
+++ b/src/modules/permissions/address.c
@@ -192,8 +192,13 @@ int reload_address_db_table(address_tables_group_t *atg)
ROW_N(row + i));
goto dberror;
}
- if((VAL_TYPE(val) != DB1_INT && VAL_TYPE(val) != DB1_UINT)
- || VAL_NULL(val) || (VAL_INT(val) <= 0)) {
+ if(VAL_NULL(val)) {
+ LM_DBG("failure during checks of database value 1
(group) in "
+ "address table\n");
+ goto dberror;
+ }
+ if(!((VAL_TYPE(val) == DB1_INT && VAL_INT(val) > 0)
+ || (VAL_TYPE(val) == DB1_UINT &&
VAL_UINT(val) > 0))) {
LM_DBG("failure during checks of database value 1
(group) in "
"address table\n");
goto dberror;
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
