mirror of https://github.com/sipwise/kamailio.git
- removed patch: `pvheaders_memleak.patch` is obsolete with the upstream commit 9fae7141abd0f52d717bf37c742993ff578e7d95 - removed patch: `siputils_tel2sip_check_uri.patch` is obsolete with the upstream commit e4d57acc23bc45f86ff60833a6d3e392274608b6 (This one indeed was missed before in the series file when adding another patch) - removed patch: `redis_dbase_no_error_msg.patch` is obsolete with the upstream commit 1f489b057e03446c9b4b522c4ec9d6ab7cb792e3 - adapted patch `rtpengine_stats_update.patch`mr26.2
Donat Zenichev
2 weeks ago
parent
dc720d9130
commit
1a6e3d3afd
@ -1,31 +0,0 @@
|
||||
--- a/src/modules/pv_headers/pvh_xavp.c
|
||||
+++ b/src/modules/pv_headers/pvh_xavp.c
|
||||
@@ -713,7 +713,13 @@ xavp_c_data_t *pvh_set_parsed(
|
||||
return c_data;
|
||||
|
||||
err:
|
||||
- // how can I call?? pvh_xavi_free_data(c_data, shm_free);
|
||||
+ if(c_data != NULL) {
|
||||
+ if(c_data->value.s != NULL) {
|
||||
+ shm_free(c_data->value.s);
|
||||
+ }
|
||||
+ shm_free(c_data);
|
||||
+ c_data = NULL;
|
||||
+ }
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -886,6 +892,13 @@ int pvh_set_uri(struct sip_msg *msg, pv_
|
||||
err:
|
||||
if(pv_format)
|
||||
pv_elem_free_all(pv_format);
|
||||
+ if(c_data != NULL) {
|
||||
+ if(c_data->value.s != NULL) {
|
||||
+ shm_free(c_data->value.s);
|
||||
+ }
|
||||
+ shm_free(c_data);
|
||||
+ c_data = NULL;
|
||||
+ }
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
--- a/src/modules/db_redis/redis_dbase.c
|
||||
+++ b/src/modules/db_redis/redis_dbase.c
|
||||
@@ -1662,11 +1662,11 @@ static int db_redis_perform_query(const
|
||||
|
||||
if(!(*keys_count) && do_table_scan) {
|
||||
if(_n > 0) {
|
||||
- LM_WARN("performing full table scan on table '%.*s' while doing "
|
||||
+ LM_DBG("performing full table scan on table '%.*s' while doing "
|
||||
"the query\n",
|
||||
CON_TABLE(_h)->len, CON_TABLE(_h)->s);
|
||||
for(i = 0; i < _n; ++i) {
|
||||
- LM_WARN(" scan key %d is '%.*s'\n", i, _k[i]->len, _k[i]->s);
|
||||
+ LM_DBG(" scan key %d is '%.*s'\n", i, _k[i]->len, _k[i]->s);
|
||||
}
|
||||
} else {
|
||||
LM_DBG("loading full table: '%.*s\n", CON_TABLE(_h)->len,
|
||||
@@ -1854,7 +1854,7 @@ static int db_redis_perform_delete(const
|
||||
|
||||
if(!*keys_count && do_table_scan) {
|
||||
if(!ts_scan_start)
|
||||
- LM_WARN("performing full table scan on table '%.*s' while "
|
||||
+ LM_DBG("performing full table scan on table '%.*s' while "
|
||||
"performing delete\n",
|
||||
CON_TABLE(_h)->len, CON_TABLE(_h)->s);
|
||||
else
|
||||
@@ -2191,11 +2191,11 @@ static int db_redis_perform_update(const
|
||||
#endif
|
||||
|
||||
if(!(*keys_count) && do_table_scan) {
|
||||
- LM_WARN("performing full table scan on table '%.*s' while performing "
|
||||
+ LM_DBG("performing full table scan on table '%.*s' while performing "
|
||||
"update\n",
|
||||
CON_TABLE(_h)->len, CON_TABLE(_h)->s);
|
||||
for(i = 0; i < _n; ++i) {
|
||||
- LM_WARN(" scan key %d is '%.*s'\n", i, _k[i]->len, _k[i]->s);
|
||||
+ LM_DBG(" scan key %d is '%.*s'\n", i, _k[i]->len, _k[i]->s);
|
||||
}
|
||||
if(db_redis_scan_query_keys(con, CON_TABLE(_h), _n, keys, keys_count,
|
||||
manual_keys, manual_keys_count, ts_scan_start, ts_scan_key,
|
||||
@ -1,42 +0,0 @@
|
||||
--- a/src/modules/siputils/checks.c
|
||||
+++ b/src/modules/siputils/checks.c
|
||||
@@ -645,6 +645,7 @@ int tel2sip(struct sip_msg *_msg, char *
|
||||
int i, j, in_tel_parameters = 0;
|
||||
pv_spec_t *res;
|
||||
pv_value_t res_val;
|
||||
+ struct sip_uri parsed_check;
|
||||
|
||||
/* get parameters */
|
||||
if(get_str_fparam(&uri, _msg, (fparam_t *)_uri) < 0) {
|
||||
@@ -709,6 +710,11 @@ int tel2sip(struct sip_msg *_msg, char *
|
||||
/* tel_uri is not needed anymore */
|
||||
pkg_free(tel_uri.s);
|
||||
|
||||
+ if(parse_uri(sip_uri.s, sip_uri.len, &parsed_check) < 0) {
|
||||
+ pkg_free(sip_uri.s);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
/* set result pv value and write sip uri to result pv */
|
||||
res_val.rs = sip_uri;
|
||||
res_val.flags = PV_VAL_STR;
|
||||
@@ -823,6 +829,7 @@ int tel2sip2(struct sip_msg *_msg, char
|
||||
pv_value_t res_val;
|
||||
char *tmp_ptr = NULL;
|
||||
tel_param_t params[MAX_TEL_PARAMS];
|
||||
+ struct sip_uri parsed_check;
|
||||
|
||||
/* get parameters */
|
||||
if(get_str_fparam(&uri, _msg, (fparam_t *)_uri) < 0) {
|
||||
@@ -935,6 +942,11 @@ int tel2sip2(struct sip_msg *_msg, char
|
||||
/* tel_uri is not needed anymore */
|
||||
pkg_free(tel_uri.s);
|
||||
|
||||
+ if(parse_uri(sip_uri.s, sip_uri.len, &parsed_check) < 0) {
|
||||
+ pkg_free(sip_uri.s);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
sip_uri.len = strlen(sip_uri.s);
|
||||
|
||||
/* set result pv value and write sip uri to result pv */
|
||||
Loading…
Reference in new issue