[sr-dev] git:master:550cb6f7: Merge pull request #1310 from kamailio/cchance/registrar

Module: kamailio Branch: master Commit: 550cb6f775af01b29b38a8fbddfd5d01bf0983f5 URL: https://github.com/kamailio/kamailio/commit/550cb6f775af01b29b38a8fbddfd5d0… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: GitHub &lt;noreply(a)github.com&gt; Date: 2017-11-12T12:01:57+01:00 Merge pull request #1310 from kamailio/cchance/registrar registrar: added server_id to ulc pv attributes --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/550cb6f775af01b29b38a8fbddfd5d0… Patch: https://github.com/kamailio/kamailio/commit/550cb6f775af01b29b38a8fbddfd5d0… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 00b68018b8..6db4de5aed 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1598,7 +1598,11 @@ event_route[usrloc:contact-expired] { <listitem> <para><emphasis>conid</emphasis> - TCP socket internal connection ID ($null if UDP) </para> - </listitem> + </listitem> + <listitem> + <para><emphasis>server_id</emphasis> - server_id value + </para> + </listitem> </itemizedlist> <para> The pseudo-variable accepts positive index value to access diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index e90625cdc4..b6fad8856f 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -273,6 +273,9 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, if (c->sock && (c->sock->proto == PROTO_TCP || c->sock->proto == PROTO_TLS || c->sock->proto == PROTO_WS || c->sock->proto == PROTO_WSS)) return pv_get_sintval(msg, param, res, c->tcpconn_id); break; + case 22: /* server_id */ + return pv_get_uintval(msg, param, res, c->server_id); + break; } return pv_get_null(msg, param, res); @@ -400,6 +403,10 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 20; else goto error; break; + case 9: + if(strncmp(pa.s, "server_id", 9)==0) + rp->attr = 22; + break; case 10: if(strncmp(pa.s, "user_agent", 10)==0) rp->attr = 12;