git:master:3c9037e9: pv: added variable $msgbuf(index) - sr-dev

27 Jul 2021

Module: kamailio
Branch: master
Commit: 3c9037e94a33396487ddd72ade607756ea1a91bc
URL: https://github.com/kamailio/kamailio/commit/3c9037e94a33396487ddd72ade607756...
Author: Daniel-Constantin Mierla miconda@gmail.com
Committer: Daniel-Constantin Mierla miconda@gmail.com
Date: 2021-07-27T15:45:21+02:00
pv: added variable $msgbuf(index)
- get/set the character at the position index in the message buffer
---
Modified: src/modules/pv/pv.c
Modified: src/modules/pv/pv_core.c
Modified: src/modules/pv/pv_core.h
---
Diff:  https://github.com/kamailio/kamailio/commit/3c9037e94a33396487ddd72ade607756...
Patch: https://github.com/kamailio/kamailio/commit/3c9037e94a33396487ddd72ade607756...
---

diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c
index cc976c86c0..c4e33b4d31 100644
--- a/src/modules/pv/pv.c
+++ b/src/modules/pv/pv.c
@@ -552,6 +552,8 @@ static pv_export_t mod_pvs[] = {
    	pv_parse_via_name, 0, 0, 0},
    {{"viaZ", (sizeof("viaZ")-1)}, PVT_OTHER, pv_get_viaZ, 0,
    	pv_parse_via_name, 0, 0, 0},
+	{{"msgbuf", (sizeof("msgbuf")-1)}, PVT_OTHER, pv_get_msgbuf, pv_set_msgbuf,
+		pv_parse_msgbuf_name, 0, 0, 0},
{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c
index 292c96758c..44cc551212 100644
--- a/src/modules/pv/pv_core.c
+++ b/src/modules/pv/pv_core.c
@@ -4633,3 +4633,115 @@ int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res)
return pv_get_via_attr(msg, vbZ, param, res);
 }
+
+/**
+ *
+ */
+int pv_parse_msgbuf_name(pv_spec_t *sp, str *in)
+{
+	int n;
+	char *p;
+	pv_spec_t *nsp = 0;
+
+	if(in==NULL || in->s==NULL || in->len<=0 || sp==NULL) {
+		return -1;
+	}
+
+	p = in->s;
+	if(*p==PV_MARKER) {
+		nsp = (pv_spec_p)pkg_malloc(sizeof(pv_spec_t));
+		if(nsp==NULL) {
+			LM_ERR("no more memory\n");
+			return -1;
+		}
+		p = pv_parse_spec(in, nsp);
+		if(p==NULL) {
+			LM_ERR("invalid variable [%.*s]\n", in->len, in->s);
+			pv_spec_free(nsp);
+			return -1;
+		}
+		//LM_ERR("dynamic name [%.*s]\n", in->len, in->s);
+		//pv_print_spec(nsp);
+		sp->pvp.pvn.type = PV_NAME_PVAR;
+		sp->pvp.pvn.u.dname = (void*)nsp;
+		return 0;
+	}
+
+	if (str2sint(in, &n) != 0) {
+		LM_ERR("bad index value: [%.*s]\n", in->len, in->s);
+		return -1;
+	}
+
+	sp->pvp.pvn.u.isname.name.n = n;
+	sp->pvp.pvn.type = PV_NAME_INTSTR;
+	sp->pvp.pvn.u.isname.type = 0;
+
+	return 0;
+}
+
+/**
+ *
+ */
+int pv_get_vparam_ival(sip_msg_t *msg, pv_param_t *param)
+{
+	pv_value_t vval;
+
+	if(param->pvn.type==PV_NAME_PVAR) {
+		/* pvar */
+		if(pv_get_spec_value(msg, (pv_spec_t*)(param->pvn.u.dname), &vval)!=0) {
+			LM_ERR("cannot get name value\n");
+			return -1;
+		}
+		return vval.ri;
+	} else {
+		return param->pvn.u.isname.name.n;
+	}
+}
+
+/**
+ *
+ */
+int pv_get_msgbuf(sip_msg_t *msg, pv_param_t *param, pv_value_t *res)
+{
+	int n;
+	static char outmsgbuf[4];
+
+	n = pv_get_vparam_ival(msg, param);
+
+	if(n<0 || n>=msg->len) {
+		LM_ERR("index out of range\n");
+		return pv_get_null(msg, param, res);
+	}
+	outmsgbuf[0] = msg->buf[n];
+	outmsgbuf[1] = '\0';
+	return pv_get_strlval(msg, param, res, outmsgbuf, 2);
+}
+
+/**
+ *
+ */
+int pv_set_msgbuf(sip_msg_t *msg, pv_param_t *param,
+		int op, pv_value_t *val)
+{
+	int n;
+
+	n = pv_get_vparam_ival(msg, param);
+
+	if(n<0 || n>=msg->len) {
+		LM_ERR("index out of range\n");
+		return -1;
+	}
+
+	if((val==NULL) || (val->flags&PV_VAL_NULL)) {
+		LM_ERR("null value - skipping\n");
+		return 1;
+	}
+	if(!(val->flags&PV_VAL_STR) || val->rs.len<=0) {
+		LM_ERR("error - str value required\n");
+		return -1;
+	}
+
+	msg->buf[n] = val->rs.s[0];
+
+	return 0;
+}
diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h
index 14c79ce86c..6406d9054a 100644
--- a/src/modules/pv/pv_core.h
+++ b/src/modules/pv/pv_core.h
@@ -416,5 +416,11 @@ int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);
 int pv_get_via1(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);
 int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);
+int pv_parse_msgbuf_name(pv_spec_t *sp, str *in);
+int pv_get_msgbuf(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);
+int pv_set_msgbuf(sip_msg_t *msg, pv_param_t *param,
+		int op, pv_value_t *val);
+
+
 #endif

    