From 81232aba8a95f79647a5d6189bd9d3efcc580269 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Tue, 22 Nov 2022 09:32:57 +0100 Subject: [PATCH] erlang: updated to use xavp long value field --- src/modules/erlang/pv_atom.c | 1 - src/modules/erlang/pv_list.c | 8 ++------ src/modules/erlang/pv_pid.c | 1 - src/modules/erlang/pv_ref.c | 1 - src/modules/erlang/pv_tuple.c | 8 ++------ src/modules/erlang/pv_xbuff.c | 14 +++++--------- 6 files changed, 9 insertions(+), 24 deletions(-) diff --git a/src/modules/erlang/pv_atom.c b/src/modules/erlang/pv_atom.c index 092672751ce..9b7f0555cfb 100644 --- a/src/modules/erlang/pv_atom.c +++ b/src/modules/erlang/pv_atom.c @@ -251,7 +251,6 @@ int pv_atom_get_value(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); break; case SR_XTYPE_DATA: - case SR_XTYPE_INT: case SR_XTYPE_TIME: case SR_XTYPE_LONG: case SR_XTYPE_LLONG: diff --git a/src/modules/erlang/pv_list.c b/src/modules/erlang/pv_list.c index d0f1733f0c7..cc533f597f5 100644 --- a/src/modules/erlang/pv_list.c +++ b/src/modules/erlang/pv_list.c @@ -204,8 +204,8 @@ int pv_list_get_value(struct sip_msg *msg, pv_param_t *param, case SR_XTYPE_NULL: return pv_get_null(msg, param, res); break; - case SR_XTYPE_INT: - return pv_get_sintval(msg, param, res, avp->val.v.i); + case SR_XTYPE_LONG: + return pv_get_sintval(msg, param, res, avp->val.v.l); break; case SR_XTYPE_STR: switch (avp->name.s[0]) { @@ -221,10 +221,6 @@ int pv_list_get_value(struct sip_msg *msg, pv_param_t *param, if(snprintf(_pv_xavp_buf, 128, "%lu", (long unsigned)avp->val.v.t)<0) return pv_get_null(msg, param, res); break; - case SR_XTYPE_LONG: - if(snprintf(_pv_xavp_buf, 128, "%ld", (long unsigned)avp->val.v.l)<0) - return pv_get_null(msg, param, res); - break; case SR_XTYPE_LLONG: if(snprintf(_pv_xavp_buf, 128, "%lld", avp->val.v.ll)<0) return pv_get_null(msg, param, res); diff --git a/src/modules/erlang/pv_pid.c b/src/modules/erlang/pv_pid.c index acb2bee5b2b..34551f8ede1 100644 --- a/src/modules/erlang/pv_pid.c +++ b/src/modules/erlang/pv_pid.c @@ -246,7 +246,6 @@ int pv_pid_get_value(struct sip_msg *msg, pv_param_t *param, break; case SR_XTYPE_XAVP: case SR_XTYPE_STR: - case SR_XTYPE_INT: case SR_XTYPE_TIME: case SR_XTYPE_LONG: case SR_XTYPE_LLONG: diff --git a/src/modules/erlang/pv_ref.c b/src/modules/erlang/pv_ref.c index 927cb4b855e..5abff809c74 100644 --- a/src/modules/erlang/pv_ref.c +++ b/src/modules/erlang/pv_ref.c @@ -246,7 +246,6 @@ int pv_ref_get_value(struct sip_msg *msg, pv_param_t *param, break; case SR_XTYPE_XAVP: case SR_XTYPE_STR: - case SR_XTYPE_INT: case SR_XTYPE_TIME: case SR_XTYPE_LONG: case SR_XTYPE_LLONG: diff --git a/src/modules/erlang/pv_tuple.c b/src/modules/erlang/pv_tuple.c index ad02370ee59..83fd01e902d 100644 --- a/src/modules/erlang/pv_tuple.c +++ b/src/modules/erlang/pv_tuple.c @@ -206,8 +206,8 @@ int pv_tuple_get_value(struct sip_msg *msg, pv_param_t *param, case SR_XTYPE_NULL: return pv_get_null(msg, param, res); break; - case SR_XTYPE_INT: - return pv_get_sintval(msg, param, res, avp->val.v.i); + case SR_XTYPE_LONG: + return pv_get_sintval(msg, param, res, avp->val.v.l); break; case SR_XTYPE_STR: switch (avp->name.s[0]) { @@ -223,10 +223,6 @@ int pv_tuple_get_value(struct sip_msg *msg, pv_param_t *param, if(snprintf(_pv_xavp_buf, 128, "%lu", (long unsigned)avp->val.v.t)<0) return pv_get_null(msg, param, res); break; - case SR_XTYPE_LONG: - if(snprintf(_pv_xavp_buf, 128, "%ld", (long unsigned)avp->val.v.l)<0) - return pv_get_null(msg, param, res); - break; case SR_XTYPE_LLONG: if(snprintf(_pv_xavp_buf, 128, "%lld", avp->val.v.ll)<0) return pv_get_null(msg, param, res); diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index b19a22ac8e1..42af43798f7 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -317,8 +317,8 @@ int pv_xbuff_new_xavp(sr_xavp_t **new, pv_value_t *pval, int *counter, char pref nval.type = SR_XTYPE_NULL; s[0] = prefix ? prefix : 'n'; } else if (pval->flags&PV_VAL_INT) { - nval.type = SR_XTYPE_INT; - nval.v.i = pval->ri; + nval.type = SR_XTYPE_LONG; + nval.v.l = pval->ri; s[0] = prefix ? prefix : 'i'; } else if (pval->flags&PV_VAL_STR) { /* check what it is */ @@ -596,8 +596,8 @@ int pv_xbuff_get_value(struct sip_msg *msg, pv_param_t *param, case SR_XTYPE_NULL: return pv_get_null(msg, param, res); break; - case SR_XTYPE_INT: - return pv_get_sintval(msg, param, res, avp->val.v.i); + case SR_XTYPE_LONG: + return pv_get_sintval(msg, param, res, avp->val.v.l); break; case SR_XTYPE_STR: switch (avp->name.s[0]) { @@ -613,10 +613,6 @@ int pv_xbuff_get_value(struct sip_msg *msg, pv_param_t *param, if(snprintf(_pv_xavp_buf, 128, "%lu", (long unsigned)avp->val.v.t)<0) return pv_get_null(msg, param, res); break; - case SR_XTYPE_LONG: - if(snprintf(_pv_xavp_buf, 128, "%ld", (long unsigned)avp->val.v.l)<0) - return pv_get_null(msg, param, res); - break; case SR_XTYPE_LLONG: if(snprintf(_pv_xavp_buf, 128, "%lld", avp->val.v.ll)<0) return pv_get_null(msg, param, res); @@ -1084,7 +1080,7 @@ int xavp_decode(ei_x_buff *xbuff, int *index, sr_xavp_t **xavp,int level) name.len = snprintf(_s,sizeof(_s),"i%d",counter++); ei_decode_long(xbuff->buff,index,&val.v.l); - val.type = SR_XTYPE_INT; + val.type = SR_XTYPE_LONG; *xavp = xavp_new_value(&name,&val); if (!*xavp) {