[sr-dev] git:master:f3277f27: tcpops: new varaibale $tcp(key)

Module: kamailio Branch: master Commit: f3277f27cef07e6d33cafcdf149fc34d1b3b079a URL: https://github.com/kamailio/kamailio/commit/f3277f27cef07e6d33cafcdf149fc34… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2019-10-28T12:55:59+01:00 tcpops: new varaibale $tcp(key) - return attributes related to tcp connection - the key can be: - c_si - connection source ip (useful with HAProxy connections) - c_sp - connection source port (useful with HAProxy connections) - conid - connection id - GH #2103 --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f3277f27cef07e6d33cafcdf149fc34… Patch: https://github.com/kamailio/kamailio/commit/f3277f27cef07e6d33cafcdf149fc34… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index e5ac55d660..b95a642f8d 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -65,6 +65,16 @@ static int fixup_numpv(void** param, int param_no); str tcpops_event_callback = STR_NULL; +static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_tcp_name(pv_spec_p sp, str *in); + +static pv_export_t mod_pvs[] = { + { {"tcp", (sizeof("tcp")-1)}, PVT_CONTEXT, pv_get_tcp, + 0, pv_parse_tcp_name, 0, 0, 0}, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, fixup_numpv, 0, ANY_ROUTE}, @@ -105,7 +115,7 @@ struct module_exports exports = { cmds, /* exported functions to config */ params, /* exported parameters to config */ 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* response function */ mod_init, /* module initialization function */ child_init, /* per child init function */ @@ -602,6 +612,75 @@ static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn) return ki_tcp_get_conid_helper(msg, &saddr, (pv_spec_t*)pvn); } +/** + * + */ +static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + tcp_connection_t *con; + int ival; + str sval; + + if (msg == NULL) { + return -1; + } + + if ((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 1: + sval.s = ip_addr2a(&con->cinfo.src_ip); + tcpconn_put(con); + sval.len = strlen(sval.s); + return pv_get_strval(msg, param, res, &sval); + case 2: + ival = con->cinfo.src_port; + tcpconn_put(con); + return pv_get_sintval(msg, param, res, ival); + default: + ival = con->id; + tcpconn_put(con); + return pv_get_sintval(msg, param, res, ival); + } +} + + +/** + * + */ +static int pv_parse_tcp_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 4: + if(strncmp(in->s, "c_si", 4)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else if(strncmp(in->s, "c_sp", 4)==0) { + sp->pvp.pvn.u.isname.name.n = 2; + } else { goto error; } + break; + case 5: + if(strncmp(in->s, "conid", 5)==0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else { goto error; } + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown pv key: %.*s\n", in->len, in->s); + return -1; +} + /** * */