sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:master:f2f789eb: modules/siputils: do not log every P -header, shortcut loop instead
by Mikko Lehto 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: f2f789eb40c379c9ebe12e0588e521680951e017 URL: https://github.com/kamailio/kamailio/commit/f2f789eb40c379c9ebe12e0588e5216… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:48:29+02:00 modules/siputils: do not log every P -header, shortcut loop instead --- Modified: modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/f2f789eb40c379c9ebe12e0588e5216… Patch: https://github.com/kamailio/kamailio/commit/f2f789eb40c379c9ebe12e0588e5216… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index a8e8270..51d113e 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -216,9 +216,9 @@ static int sip_get_charging_vector(struct sip_msg *msg, struct hdr_field ** hf_p for (hf=msg->headers; hf; hf=hf->next) { - if ( hf->name.s[0] == 'P' ) + if ( hf->name.s[0] != 'P' ) { - LM_DBG("checking header=%.*s\n", hf->name.len, hf->name.s ); + continue; } if ( cmp_hdrname_str(&hf->name, &hdrname) == 0)

1 0

git:master:7d176126: modules/siputils: do not log CRLF
by Mikko Lehto 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: 7d1761268615b37f3a0fc49de14b1029c5a27fec URL: https://github.com/kamailio/kamailio/commit/7d1761268615b37f3a0fc49de14b102… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:48:18+02:00 modules/siputils: do not log CRLF --- Modified: modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/7d1761268615b37f3a0fc49de14b102… Patch: https://github.com/kamailio/kamailio/commit/7d1761268615b37f3a0fc49de14b102… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index 08a7e7d..a8e8270 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -391,7 +391,7 @@ int sip_handle_pcv(struct sip_msg *msg, char *flags, char *str2) /* if generated, reparse it */ sip_parse_charging_vector( pcv_body, pcv.len-19 ); /* if it was generated, we need to send it out as a header */ - LM_INFO("Generated PCV header %.*s\n", pcv.len, pcv_buf ); + LM_INFO("Generated PCV header %.*s\n", pcv.len-2, pcv_buf ); i = sip_add_charging_vector(msg); if (i <= 0) {

1 0

git:master:3ee6f19c: modules/siputils: fix variable typo
by Mikko Lehto 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: 3ee6f19c1994952aa5588ccb6b6986ce4c176e6a URL: https://github.com/kamailio/kamailio/commit/3ee6f19c1994952aa5588ccb6b6986c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:47:55+02:00 modules/siputils: fix variable typo --- Modified: modules/siputils/chargingvector.c Modified: modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/3ee6f19c1994952aa5588ccb6b6986c… Patch: https://github.com/kamailio/kamailio/commit/3ee6f19c1994952aa5588ccb6b6986c… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index f010506..08a7e7d 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -33,8 +33,8 @@ #define P_CHARGING_VECTOR "P-Charging-Vector" #define LOOPBACK_IP 16777343 -#define PVC_BUF_SIZE 256 -static char pcv_buf[PVC_BUF_SIZE]; +#define PCV_BUF_SIZE 256 +static char pcv_buf[PCV_BUF_SIZE]; static str pcv = { pcv_buf, 0 }; static str pcv_host = { NULL, 0 }; static str pcv_id = { NULL, 0 }; @@ -128,7 +128,7 @@ static void sip_generate_charging_vector(char * pcv) } idx++; } - LM_DBG("CV generate"); + LM_DBG("PCV generate\n"); int i = 0; pcv[0] = '\0'; for ( i = 0 ; i < SIZE_CONF_ID ; i ++ ) @@ -155,14 +155,14 @@ static unsigned int sip_param_end(const char * s, unsigned int len) return len; } -static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) +static int sip_parse_charging_vector(const char * pcv_value, unsigned int len) { /* now point to each PCV component */ - LM_DBG("parsing PCV header [%s]\n", pvc_value); + LM_DBG("parsing PCV header [%s]\n", pcv_value); char *s = NULL; - s = strstr(pvc_value, "icid-value="); + s = strstr(pcv_value, "icid-value="); if (s != NULL) { pcv_id.s = s + strlen("icid-value="); @@ -176,7 +176,7 @@ static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) pcv_id.len = 0; } - s = strstr(pvc_value, "icid-generated-at="); + s = strstr(pcv_value, "icid-generated-at="); if (s != NULL) { pcv_host.s = s + strlen("icid-generated-at="); @@ -193,7 +193,7 @@ static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) // Buggy charging vector where only icid-value is sent ... if ( pcv_host.s == NULL && pcv_id.s == NULL && len > 0) { - pcv_id.s = (char *) pvc_value, + pcv_id.s = (char *) pcv_value, pcv_id.len = sip_param_end(pcv_id.s, len); LM_WARN("parsed BUGGY P-Charging-Vector %.*s\n", pcv_id.len, pcv_id.s ); } @@ -259,7 +259,7 @@ static int sip_get_charging_vector(struct sip_msg *msg, struct hdr_field ** hf_p return 1; } -// Remove PVC if it is in the inbound request (if it was found by sip_get_charging_vector) +// Remove PCV if it is in the inbound request (if it was found by sip_get_charging_vector) static int sip_remove_charging_vector(struct sip_msg *msg, struct hdr_field *hf) { struct lump* l; @@ -381,7 +381,7 @@ int sip_handle_pcv(struct sip_msg *msg, char *flags, char *str2) sip_generate_charging_vector(pcv_value); - pcv.len = snprintf( pcv_body, PVC_BUF_SIZE - 19, "icid-value=%.*s; icid-generated-at=%.*s\r\n", 32, pcv_value, + pcv.len = snprintf( pcv_body, PCV_BUF_SIZE - 19, "icid-value=%.*s; icid-generated-at=%.*s\r\n", 32, pcv_value, msg->rcv.bind_address->address_str.len, msg->rcv.bind_address->address_str.s ); pcv.len += 19; @@ -391,7 +391,7 @@ int sip_handle_pcv(struct sip_msg *msg, char *flags, char *str2) /* if generated, reparse it */ sip_parse_charging_vector( pcv_body, pcv.len-19 ); /* if it was generated, we need to send it out as a header */ - LM_INFO("Generated PCV header %.*s.\n", pcv.len, pcv_buf ); + LM_INFO("Generated PCV header %.*s\n", pcv.len, pcv_buf ); i = sip_add_charging_vector(msg); if (i <= 0) { diff --git a/modules/siputils/siputils.c b/modules/siputils/siputils.c index db35a24..156c849 100644 --- a/modules/siputils/siputils.c +++ b/modules/siputils/siputils.c @@ -199,7 +199,7 @@ static param_export_t params[] = { static pv_export_t mod_pvs[] = { - { {"pcv", (sizeof("pvc")-1)}, PVT_OTHER, pv_get_charging_vector, + { {"pcv", (sizeof("pcv")-1)}, PVT_OTHER, pv_get_charging_vector, 0, pv_parse_charging_vector_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 }

1 0

git:master:6dbc20dd: modules/siputils: adjust logging to be more accurate and less verbose
by Mikko Lehto 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: 6dbc20dd07935346065de67341aae460f9c57177 URL: https://github.com/kamailio/kamailio/commit/6dbc20dd07935346065de67341aae46… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:47:19+02:00 modules/siputils: adjust logging to be more accurate and less verbose --- Modified: modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/6dbc20dd07935346065de67341aae46… Patch: https://github.com/kamailio/kamailio/commit/6dbc20dd07935346065de67341aae46… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index 8dc5ddb..f010506 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -158,7 +158,7 @@ static unsigned int sip_param_end(const char * s, unsigned int len) static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) { /* now point to each PCV component */ - LM_DBG("acc: parsing PCV header [%s].\n", pvc_value); + LM_DBG("parsing PCV header [%s]\n", pvc_value); char *s = NULL; @@ -167,7 +167,7 @@ static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) { pcv_id.s = s + strlen("icid-value="); pcv_id.len = sip_param_end(pcv_id.s, len); - LM_INFO("acc: parsed P-Charging-Vector icid-value=%.*s", + LM_DBG("parsed P-Charging-Vector icid-value=%.*s\n", pcv_id.len, pcv_id.s ); } else @@ -181,7 +181,7 @@ static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) { pcv_host.s = s + strlen("icid-generated-at="); pcv_host.len = sip_param_end(pcv_id.s, len); - LM_DBG("acc: parsed P-Charging-Vector icid-generated-at=%.*s", + LM_DBG("parsed P-Charging-Vector icid-generated-at=%.*s\n", pcv_host.len, pcv_host.s ); } else @@ -195,7 +195,7 @@ static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) { pcv_id.s = (char *) pvc_value, pcv_id.len = sip_param_end(pcv_id.s, len); - LM_WARN("acc: parsed BUGGY P-Charging-Vector %.*s", pcv_id.len, pcv_id.s ); + LM_WARN("parsed BUGGY P-Charging-Vector %.*s\n", pcv_id.len, pcv_id.s ); } return (pcv_id.s != NULL); @@ -218,13 +218,13 @@ static int sip_get_charging_vector(struct sip_msg *msg, struct hdr_field ** hf_p { if ( hf->name.s[0] == 'P' ) { - LM_INFO("acc: checking heander=%.*s\n", hf->name.len, hf->name.s ); + LM_DBG("checking header=%.*s\n", hf->name.len, hf->name.s ); } if ( cmp_hdrname_str(&hf->name, &hdrname) == 0) { /* - * append p charging vector valus after the header name "P-Charging-Vector" and + * append p charging vector values after the header name "P-Charging-Vector" and * the ": " (+2) */ char * pcv_body = pcv_buf + strlen(P_CHARGING_VECTOR) + 2; @@ -246,7 +246,7 @@ static int sip_get_charging_vector(struct sip_msg *msg, struct hdr_field ** hf_p } else { - pcv_id.s =0; + pcv_id.s = 0; pcv_id.len = 0; pcv_host.s = 0; pcv_host.len = 0; @@ -255,7 +255,7 @@ static int sip_get_charging_vector(struct sip_msg *msg, struct hdr_field ** hf_p *hf_pcv = hf; } } - LM_INFO("No valid P-Charging-Vector header found.\n"); + LM_DBG("No valid P-Charging-Vector header found.\n"); return 1; } @@ -351,7 +351,7 @@ int sip_handle_pcv(struct sip_msg *msg, char *flags, char *str2) sip_get_charging_vector(msg, &hf_pcv); /* - * We need to remove the original PCV if it was present and ether + * We need to remove the original PCV if it was present and either * we were asked to remove it or we were asked to replace it */ if ( pcv_status == PCV_PARSED && (replace_pcv || remove_pcv) ) @@ -416,7 +416,7 @@ int pv_get_charging_vector(struct sip_msg *msg, pv_param_t *param, pv_value_t *r { current_msg_id = msg->id; } - LM_DBG("Parsed charging vector for pseudo-var \n"); + LM_DBG("Parsed charging vector for pseudo-var\n"); } else { @@ -426,7 +426,9 @@ int pv_get_charging_vector(struct sip_msg *msg, pv_param_t *param, pv_value_t *r switch(pcv_status) { case PCV_GENERATED: + LM_DBG("pcv_status==PCV_GENERATED\n"); case PCV_PARSED: + LM_DBG("pcv_status==PCV_PARSED\n"); switch( param->pvn.u.isname.name.n ) { case 2:

1 0

git:master:2e85af56: modules/siputils: whitespace cleanup
by Mikko Lehto 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: 2e85af56fda9b2d7795d3ba0cc04e0f882f398ad URL: https://github.com/kamailio/kamailio/commit/2e85af56fda9b2d7795d3ba0cc04e0f… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:46:52+02:00 modules/siputils: whitespace cleanup --- Modified: modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/2e85af56fda9b2d7795d3ba0cc04e0f… Patch: https://github.com/kamailio/kamailio/commit/2e85af56fda9b2d7795d3ba0cc04e0f… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index 6d02000..8dc5ddb 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -30,15 +30,15 @@ #include "chargingvector.h" #define SIZE_CONF_ID 16 -#define P_CHARGING_VECTOR "P-Charging-Vector" -#define LOOPBACK_IP 16777343 +#define P_CHARGING_VECTOR "P-Charging-Vector" +#define LOOPBACK_IP 16777343 -#define PVC_BUF_SIZE 256 +#define PVC_BUF_SIZE 256 static char pcv_buf[PVC_BUF_SIZE]; static str pcv = { pcv_buf, 0 }; static str pcv_host = { NULL, 0 }; static str pcv_id = { NULL, 0 }; -static uint64_t counter = 0 ; +static uint64_t counter = 0; enum PCV_Status { @@ -54,15 +54,15 @@ static void sip_generate_charging_vector(char * pcv) { char s[PATH_MAX] = {0}; struct hostent* host = NULL; - int cdx = 0 ; - int tdx = 0 ; - int idx = 0 ; - int ipx = 0 ; + int cdx = 0; + int tdx = 0; + int idx = 0; + int ipx = 0; int pid; - uint64_t ct = 0 ; + uint64_t ct = 0; struct in_addr* in = NULL; static struct in_addr ip = {0}; - unsigned char newConferenceIdentifier[SIZE_CONF_ID]={0}; + unsigned char newConferenceIdentifier[SIZE_CONF_ID]={0}; memset(pcv,0,SIZE_CONF_ID); pid = getpid(); @@ -79,7 +79,7 @@ static void sip_generate_charging_vector(char * pcv) in = (struct in_addr*)host->h_addr_list[idx]; if (in->s_addr == LOOPBACK_IP ) { - if ( ip.s_addr == 0 ) + if ( ip.s_addr == 0 ) { ip=*in; } @@ -129,11 +129,11 @@ static void sip_generate_charging_vector(char * pcv) idx++; } LM_DBG("CV generate"); - int i =0; + int i = 0; pcv[0] = '\0'; for ( i = 0 ; i < SIZE_CONF_ID ; i ++ ) { - char hex[4] = {0 }; + char hex[4] = {0}; snprintf(hex,4,"%02X",newConferenceIdentifier[i]); strcat(pcv,hex); @@ -160,7 +160,9 @@ static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) /* now point to each PCV component */ LM_DBG("acc: parsing PCV header [%s].\n", pvc_value); - char *s = strstr(pvc_value, "icid-value="); + char *s = NULL; + + s = strstr(pvc_value, "icid-value="); if (s != NULL) { pcv_id.s = s + strlen("icid-value="); @@ -189,7 +191,7 @@ static int sip_parse_charging_vector(const char * pvc_value, unsigned int len) } // Buggy charging vector where only icid-value is sent ... - if ( pcv_host.s == NULL && pcv_id.s == NULL && len > 0) + if ( pcv_host.s == NULL && pcv_id.s == NULL && len > 0) { pcv_id.s = (char *) pvc_value, pcv_id.len = sip_param_end(pcv_id.s, len); @@ -290,7 +292,7 @@ static int sip_add_charging_vector(struct sip_msg *msg) return -1; } - s = (char*)pkg_malloc(pcv.len); + s = (char*)pkg_malloc(pcv.len); if (!s) { LM_ERR("no pkg memory left\n"); return -1;

1 0

[kamailio/kamailio] P-Charging-Vector related updates (#850)
by Mikko Lehto 07 Nov '16

07 Nov '16

Original purpose was to add new $pcv(...) pseudo variables. Ended up doing documentation stub, minor bug fix and general housekeeping. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/850 -- Commit Summary -- * modules/siputils: whitespace cleanup * modules/siputils: adjust logging to be more accurate and less verbose * modules/siputils: fix variable typo * modules/siputils: do not log CRLF * modules/siputils: do not log every P -header, shortcut loop instead * modules/siputils: fix $pcv(genaddr) length issue * modules/siputils: do not let $pcv(value) to contain invalid value * modules/siputils: populate $pcv(all) after succesful parse * modules/siputils: add P-Charging-Vector related pseudo variables * modules/siputils: document P-Charging-Vector related pseudo variables -- File Changes -- M modules/siputils/chargingvector.c (130) M modules/siputils/chargingvector.h (13) M modules/siputils/doc/siputils_admin.xml (32) M modules/siputils/siputils.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/850.patch https://github.com/kamailio/kamailio/pull/850.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/850

2 2

git:master:ce745f38: pv: return false if pv_unset() fails
by Daniel-Constantin Mierla 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: ce745f3837a668b67506bfd404c7ef619936de7a URL: https://github.com/kamailio/kamailio/commit/ce745f3837a668b67506bfd404c7ef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-06T22:55:11+01:00 pv: return false if pv_unset() fails --- Modified: modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/ce745f3837a668b67506bfd404c7ef6… Patch: https://github.com/kamailio/kamailio/commit/ce745f3837a668b67506bfd404c7ef6… --- diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 3e33596..999e589 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -577,7 +577,7 @@ static int mod_init(void) { LM_ERR("failed to register RPC commands\n"); return -1; - } + } pv_init_sbranch(); return 0; @@ -620,7 +620,10 @@ static int pv_unset(struct sip_msg* msg, char* pvid, char *foo) pv_spec_t *sp; sp = (pv_spec_t*)pvid; - pv_set_spec_value(msg, sp, 0, NULL); + if(pv_set_spec_value(msg, sp, 0, NULL)<0) { + LM_ERR("faile to unset variable\n"); + return -1; + } return 1; }

1 0

git:master:de65e91d: pv: pv_var_to_xavp() - proper test for type int of script var
by Daniel-Constantin Mierla 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: de65e91dc69d41277d2ba9459f0f82bcf80a01f5 URL: https://github.com/kamailio/kamailio/commit/de65e91dc69d41277d2ba9459f0f82b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-06T22:49:53+01:00 pv: pv_var_to_xavp() - proper test for type int of script var --- Modified: modules/pv/pv_svar.h Modified: modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/de65e91dc69d41277d2ba9459f0f82b… Patch: https://github.com/kamailio/kamailio/commit/de65e91dc69d41277d2ba9459f0f82b… --- diff --git a/modules/pv/pv_svar.h b/modules/pv/pv_svar.h index c955e06..f31839f 100644 --- a/modules/pv/pv_svar.h +++ b/modules/pv/pv_svar.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff --git a/modules/pv/pv_xavp.c b/modules/pv/pv_xavp.c index e4e94f3..28bb06e 100644 --- a/modules/pv/pv_xavp.c +++ b/modules/pv/pv_xavp.c @@ -634,7 +634,7 @@ int pv_var_to_xavp(str *varname, str *xname) if(varname->len==1 && varname->s[0] == '*') { for(it=get_var_all(); it; it=it->next) { memset(&xval, 0, sizeof(sr_xval_t)); - if(it->v.flags&VAR_VAL_INT) + if(it->v.flags==VAR_VAL_INT) { xval.type = SR_XTYPE_INT; xval.v.i = it->v.value.n; @@ -658,7 +658,7 @@ int pv_var_to_xavp(str *varname, str *xname) return -1; } memset(&xval, 0, sizeof(sr_xval_t)); - if(it->v.flags&VAR_VAL_INT) + if(it->v.flags==VAR_VAL_INT) { xval.type = SR_XTYPE_INT; xval.v.i = it->v.value.n;

1 0

git:master:f09a7ea6: pv: added missing breaks when parsing $mag() inner name
by Daniel-Constantin Mierla 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: f09a7ea6dcc4f6ccca7caff167ed89de424687b9 URL: https://github.com/kamailio/kamailio/commit/f09a7ea6dcc4f6ccca7caff167ed89d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-06T22:45:29+01:00 pv: added missing breaks when parsing $mag() inner name --- Modified: modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/f09a7ea6dcc4f6ccca7caff167ed89d… Patch: https://github.com/kamailio/kamailio/commit/f09a7ea6dcc4f6ccca7caff167ed89d… --- diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index abaa2ec..ea407ab 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -3153,14 +3153,17 @@ int pv_parse_msg_attrs_name(pv_spec_p sp, str *in) else if(strncmp(in->s, "hdrs", 4)==0) sp->pvp.pvn.u.isname.name.n = 3; else goto error; + break; case 5: if(strncmp(in->s, "fline", 5)==0) sp->pvp.pvn.u.isname.name.n = 4; else goto error; + break; case 8: if(strncmp(in->s, "body_len", 8)==0) sp->pvp.pvn.u.isname.name.n = 5; else goto error; + break; default: goto error; }

1 0

git:master:5488a913: corex: handle return code for ftell
by Daniel-Constantin Mierla 07 Nov '16

07 Nov '16

Module: kamailio Branch: master Commit: 5488a913c53d16449146625da278eec8779fdbc5 URL: https://github.com/kamailio/kamailio/commit/5488a913c53d16449146625da278eec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-06T22:40:42+01:00 corex: handle return code for ftell --- Modified: modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5488a913c53d16449146625da278eec… Patch: https://github.com/kamailio/kamailio/commit/5488a913c53d16449146625da278eec… --- diff --git a/modules/corex/corex_mod.c b/modules/corex/corex_mod.c index 3c87f21..8d9c6e7 100644 --- a/modules/corex/corex_mod.c +++ b/modules/corex/corex_mod.c @@ -341,6 +341,10 @@ static int w_file_read(sip_msg_t *msg, char *fn, char *vn) } fseek(f, 0, SEEK_END); fsize = ftell(f); + if(fsize<0) { + LM_ERR("ftell failed on file: %.*s\n", fname.len, fname.s); + return -1; + } fseek(f, 0, SEEK_SET); content = pkg_malloc(fsize + 1);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016