<div dir="ltr">Hello guys,<div><br></div><div>i just installed kamailio from </div><div><div><br></div><div></div></div><div><div><font face="monospace, monospace">deb <a href="http://deb.kamailio.org/kamailio50-nightly">http://deb.kamailio.org/kamailio50-nightly</a> jessie main</font></div><div><font face="monospace, monospace">deb-src <a href="http://deb.kamailio.org/kamailio50-nightly">http://deb.kamailio.org/kamailio50-nightly</a> jessie main</font></div></div><div></div><div><br></div><div>And i'm trying to use the newly exposed $hep(src_ip) by:</div><div><br></div><div><font face="monospace, monospace">if ( ds_is_from_list("10", "2", "sip:$hep(src_ip)" ) )</font><br></div><div><br></div><div>but i'm getting:</div><div><br></div><div><div><font face="monospace, monospace">ERROR: sipcapture [sipcapture.c:2763]: pv_parse_hep_name(): REQUEST, PRE, src_ip</font></div><div><font face="monospace, monospace">ERROR: sipcapture [sipcapture.c:2793]: pv_parse_hep_name(): unknown hep name src_ip</font></div><div><font face="monospace, monospace">ERROR: <core> [core/pvapi.c:877]: pv_parse_spec2(): pvar "hep" has an invalid name param [src_ip]</font></div><div><font face="monospace, monospace">ERROR: <core> [core/pvapi.c:1032]: pv_parse_spec2(): wrong char [)/41] in [$hep(src_ip)] at [11 (5)]</font></div><div><font face="monospace, monospace">ERROR: <core> [core/sr_module.c:1251]: fix_param(): bad PVE format: "sip:$hep(src_ip)"</font></div><div><font face="monospace, monospace">ERROR: <core> [core/mod_fix.c:539]: fixup_spve_null(): Cannot convert function parameter 1 to spve</font></div></div><div><br></div><div>Any ideas?</div><div><br></div><div>Thanks</div><div><br clear="all"><div><div class="gmail_signature"><div dir="ltr"><div>Regards,</div><div><br></div>David Villasmil<div>email: <a href="mailto:david.villasmil.work@gmail.com" target="_blank">david.villasmil.work@gmail.com</a></div><div>phone: +34669448337</div></div></div></div>
<br><div class="gmail_quote">---------- Forwarded message ----------<br>From: <b class="gmail_sendername">Daniel-Constantin Mierla</b> <span dir="ltr"><<a href="mailto:miconda@gmail.com">miconda@gmail.com</a>></span><br>Date: Fri, Dec 9, 2016 at 10:17 AM<br>Subject: [sr-dev] git:master:c32a5f64: sipcapture: added $hep(src_ip) variable<br>To: <a href="mailto:sr-dev@lists.sip-router.org">sr-dev@lists.sip-router.org</a><br><br><br>Module: kamailio<br>
Branch: master<br>
Commit: c32a5f64de4ff731488d9f6bf64651<wbr>117d26d46e<br>
URL: <a href="https://github.com/kamailio/kamailio/commit/c32a5f64de4ff731488d9f6bf64651117d26d46e" rel="noreferrer" target="_blank">https://github.com/kamailio/<wbr>kamailio/commit/<wbr>c32a5f64de4ff731488d9f6bf64651<wbr>117d26d46e</a><br>
<br>
Author: Daniel-Constantin Mierla <<a href="mailto:miconda@gmail.com">miconda@gmail.com</a>><br>
Committer: Daniel-Constantin Mierla <<a href="mailto:miconda@gmail.com">miconda@gmail.com</a>><br>
Date: 2016-12-09T10:16:31+01:00<br>
<br>
sipcapture: added $hep(src_ip) variable<br>
<br>
- reworked patch from GH #879<br>
<br>
---<br>
<br>
Modified: src/modules/sipcapture/<wbr>sipcapture.c<br>
<br>
---<br>
<br>
Diff: <a href="https://github.com/kamailio/kamailio/commit/c32a5f64de4ff731488d9f6bf64651117d26d46e.diff" rel="noreferrer" target="_blank">https://github.com/kamailio/<wbr>kamailio/commit/<wbr>c32a5f64de4ff731488d9f6bf64651<wbr>117d26d46e.diff</a><br>
Patch: <a href="https://github.com/kamailio/kamailio/commit/c32a5f64de4ff731488d9f6bf64651117d26d46e.patch" rel="noreferrer" target="_blank">https://github.com/kamailio/<wbr>kamailio/commit/<wbr>c32a5f64de4ff731488d9f6bf64651<wbr>117d26d46e.patch</a><br>
<br>
---<br>
<br>
diff --git a/src/modules/sipcapture/<wbr>sipcapture.c b/src/modules/sipcapture/<wbr>sipcapture.c<br>
index 117db74..b5bbe7b 100644<br>
--- a/src/modules/sipcapture/<wbr>sipcapture.c<br>
+++ b/src/modules/sipcapture/<wbr>sipcapture.c<br>
@@ -2835,6 +2835,11 @@ static int pv_parse_hep_name (pv_spec_p sp, str *in)<br>
else goto error;<br>
}<br>
break;<br>
+ case 6:<br>
+ {<br>
+ if(!strncmp(in->s, "src_ip", 6)) sp->pvp.pvn.u.isname.name.n = 2;<br>
+ else goto error;<br>
+ }<br>
case 7:<br>
{<br>
if(!strncmp(in->s, "version", 7)) sp->pvp.pvn.u.isname.name.n = 0;<br>
@@ -2857,17 +2862,24 @@ static int pv_parse_hep_name (pv_spec_p sp, str *in)<br>
<br>
static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res)<br>
{<br>
+ static char sc_buf_ip[IP_ADDR_MAX_STR_<wbr>SIZE+12];<br>
+ int sc_buf_ip_len;<br>
+<br>
if(param==NULL) return -1;<br>
<br>
switch(param->pvn.u.isname.<wbr>name.n)<br>
{<br>
case 0:<br>
- return pv_get_uintval(msg, param, res, hep_version(msg));<br>
- case 1:<br>
- return pv_get_uintval(msg, param, res, hep_version(msg));<br>
+ return pv_get_uintval(msg, param, res, hep_version(msg));<br>
+ case 1:<br>
+ return pv_get_uintval(msg, param, res, hep_version(msg));<br>
+ case 2:<br>
+ sc_buf_ip_len=ip_addr2sbuf(&<wbr>msg->rcv.src_ip, sc_buf_ip,<br>
+ sizeof(sc_buf_ip)-1);<br>
+ sc_buf_ip[sc_buf_ip_len]=0;<br>
+ return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len);<br>
default:<br>
return hepv3_get_chunk(msg, msg->buf, msg->len, param->pvn.u.isname.name.n, param, res);<br>
}<br>
return 0;<br>
}<br>
-<br>
<br>
<br>
______________________________<wbr>_________________<br>
sr-dev mailing list<br>
<a href="mailto:sr-dev@lists.sip-router.org">sr-dev@lists.sip-router.org</a><br>
<a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" rel="noreferrer" target="_blank">http://lists.sip-router.org/<wbr>cgi-bin/mailman/listinfo/sr-<wbr>dev</a><br>
</div><br></div></div><div hspace="streak-pt-mark" style="max-height:1px"><img style="width:0px;max-height:0px;overflow:hidden" src="https://mailfoogae.appspot.com/t?sender=aZGF2aWQudmlsbGFzbWlsLndvcmtAZ21haWwuY29t&type=zerocontent&guid=f9719fec-4f4f-4699-8ef6-bd3266e33a8e"><font color="#ffffff" size="1">ᐧ</font></div>