sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

getting id of closed ws connection using $conid pv

by Juha Heinanen

before event_route[websocket:closed] is run, i can assign id of the closed ws connection to rcv.proto_reserved1 field of the faked message: static void wsconn_run_route(ws_connection_t *wsc) { ... fmsg = faked_msg_next(); wsc->rcv.proto_reserved1 = wsc->id; fmsg->rcv = wsc->rcv; ... } the problem is that int pv_get_tcpconn_id(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) calls tcpconn_get: if ((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) return pv_get_null(msg, param, res); and since the ws connection whose id is stored in msg->rcv.proto_reserved1 does not anymore exist, the statement returns null pv value. is there some way to figure out that $conid was accessed from event_route[websocket:closed] in which case the connection id stored in msg->rcv.proto_reserved1 should be returned without checking if that connection still exists? if not, i guess i need to introduce yet another pv for the purpose. -- juha

8 years, 8 months

[kamailio] Registrar: kamailio update contact infomation failed but it sends 200-register message to client (#497)

by szkbsgy

Hi, When client send register message that reg-id in contact is "0", kamailio failed to update contacts info， but it will send 200-register to client, this will cause one issue that no one can find this client(will always be 404 error) reg-id in message: Contact: <sip:2015@100080:5060;ob>;reg-id=0 Related logs: /usr/local/sbin/kamailio[30325]: ERROR: registrar [savec:402]: pack_ci(): invalid reg-id value /usr/local/sbin/kamailio[30325]: ERROR: registrar [savec:685]: update_contacts(): failed to pack contact specific info I think registrar should reply 4xx message when reg-id's value is 0 Best Regards, Shengy --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/497

8 years, 8 months

[kamailio] PUA issue when UA is not using UDP (#509)

by Phil Lavin

A number of additional ports have been opened on Kamailio – the relevant one here is TCP 443. An INVITE comes in from a UA whose from URI is suffixed with :443. PUA generates a PUBLISH out of this. Log is at https://gist.githubusercontent.com/phil-lavin/c381d556c22fd29b4fde/raw/77c5…. The relevant bit to the issue is the last line. PUA is trying to send the PUBLISH to the address and port taken from the from URI… however it sends it over UDP. Because Kamailio is not bound to UDP 443, the PUBLISH is not received. A hacky “fix” is to make Kamailio bind to UDP 443 as well as TCP 443. I will dig into this deeper today in an attempt to find a better fix. Suggestions around what is the best solution would be appreciated. I’m thinking that sending this over TCP is not desirable in most instances – unless perhaps Kamailio is only bound to TCP ports? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/509

8 years, 8 months

git:master:93702746: Merge pull request #525 from mslehto/uacdoc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 937027467db080e12d89ab7739f114bf356a1791 URL: https://github.com/kamailio/kamailio/commit/937027467db080e12d89ab7739f114b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T23:32:23+01:00 Merge pull request #525 from mslehto/uacdoc modules/uac: document new uacreg table entries --- Modified: modules/uac/README Modified: modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/937027467db080e12d89ab7739f114b… Patch: https://github.com/kamailio/kamailio/commit/937027467db080e12d89ab7739f114b…

8 years, 8 months

git:master:6bb69733: modules/uac: refresh content of README

by Mikko Lehto

Module: kamailio Branch: master Commit: 6bb69733a156219d5368f8f950d512566810aa37 URL: https://github.com/kamailio/kamailio/commit/6bb69733a156219d5368f8f950d5125… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-03-01T22:40:43+02:00 modules/uac: refresh content of README --- Modified: modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/6bb69733a156219d5368f8f950d5125… Patch: https://github.com/kamailio/kamailio/commit/6bb69733a156219d5368f8f950d5125…

8 years, 8 months

git:master:843b881d: modules/uac: add flags and reg_delay to uacreg table documentation

by Mikko Lehto

Module: kamailio Branch: master Commit: 843b881d6ba6d15ae220c108ae85752e410dd40e URL: https://github.com/kamailio/kamailio/commit/843b881d6ba6d15ae220c108ae85752… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-03-01T22:21:48+02:00 modules/uac: add flags and reg_delay to uacreg table documentation --- Modified: modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/843b881d6ba6d15ae220c108ae85752… Patch: https://github.com/kamailio/kamailio/commit/843b881d6ba6d15ae220c108ae85752… --- diff --git a/modules/uac/doc/uac_admin.xml b/modules/uac/doc/uac_admin.xml index dc95ec8..db5f695 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -1078,7 +1078,16 @@ event_route[uac:reply] { in seconds, e.g.,: 360 </para></listitem> </itemizedlist> - + <itemizedlist> + <listitem><para> + <emphasis>flags</emphasis> - the state of the registration, see <xref linkend="uac.r.uac.reg_info"/> + </para></listitem> + </itemizedlist> + <itemizedlist> + <listitem><para> + <emphasis>reg_delay</emphasis> - delay initial registration with at least reg_delay seconds, e.g.,: 3 + </para></listitem> + </itemizedlist> <para> The module takes care of sending REGISTER and refresh registrations before they expire.

8 years, 8 months

[kamailio] modules/uac: document new uacreg table entries (#525)

by Mikko Lehto

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/525 -- Commit Summary -- * modules/uac: add flags and reg_delay to uacreg table documentation * modules/uac: refresh content of README -- File Changes -- M modules/uac/README (84) M modules/uac/doc/uac_admin.xml (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/525.patch https://github.com/kamailio/kamailio/pull/525.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/525

8 years, 8 months

git:master:479ac8ed: Merge pull request #524 from aphistic/fix-siptrace-aliasing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 479ac8ed7e3c20254c2c3a449a9e23579689b0ab URL: https://github.com/kamailio/kamailio/commit/479ac8ed7e3c20254c2c3a449a9e235… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T23:32:02+01:00 Merge pull request #524 from aphistic/fix-siptrace-aliasing siptrace: Use the trace_local_ip setting in sip_trace() --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/479ac8ed7e3c20254c2c3a449a9e235… Patch: https://github.com/kamailio/kamailio/commit/479ac8ed7e3c20254c2c3a449a9e235… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 613ea31..4594e25 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1022,29 +1022,41 @@ static int sip_trace(struct sip_msg *msg, struct dest_info * dst, char *dir) sto.body.s = msg->buf; sto.body.len = msg->len; - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); - strcat(sto.fromip_buff,":"); - strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.dir = (dir)?dir:"in"; - siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.toip_buff,":"); - strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + if (trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "out", 3) == 0) { + sto.fromip = trace_local_ip; + } else { + siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); + strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); + strcat(sto.fromip_buff,":"); + strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + } - sto.dir = (dir)?dir:"in"; + if (trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "in", 2) == 0) { + sto.toip = trace_local_ip; + } else { + siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); + strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); + strcat(sto.toip_buff,":"); + strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); + sto.toip.s = sto.toip_buff; + sto.toip.len = strlen(sto.toip_buff); + } } else { sto.body.s = snd_inf->buf; sto.body.len = snd_inf->len; - strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, - snd_inf->send_sock->sock_str.len); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + if (trace_local_ip.s && trace_local_ip.len > 0) { + sto.fromip = trace_local_ip; + } else { + strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, + snd_inf->send_sock->sock_str.len); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + } siptrace_copy_proto(snd_inf->send_sock->proto, sto.toip_buff); strcat(sto.toip_buff, suip2a(snd_inf->to, sizeof(*snd_inf->to)));

8 years, 8 months

git:master:93dcc5dc: siptrace: Use the trace_local_ip setting in sip_trace()

by Erik Davidson

Module: kamailio Branch: master Commit: 93dcc5dca539803ad7ae94dc86829d10d3d3412c URL: https://github.com/kamailio/kamailio/commit/93dcc5dca539803ad7ae94dc86829d1… Author: Erik Davidson <erik.davidson(a)corvisa.com> Committer: Erik Davidson <erik.davidson(a)corvisa.com> Date: 2016-03-01T14:36:02-06:00 siptrace: Use the trace_local_ip setting in sip_trace() --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/93dcc5dca539803ad7ae94dc86829d1… Patch: https://github.com/kamailio/kamailio/commit/93dcc5dca539803ad7ae94dc86829d1… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 613ea31..4594e25 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1022,29 +1022,41 @@ static int sip_trace(struct sip_msg *msg, struct dest_info * dst, char *dir) sto.body.s = msg->buf; sto.body.len = msg->len; - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); - strcat(sto.fromip_buff,":"); - strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.dir = (dir)?dir:"in"; - siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.toip_buff,":"); - strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + if (trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "out", 3) == 0) { + sto.fromip = trace_local_ip; + } else { + siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); + strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); + strcat(sto.fromip_buff,":"); + strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + } - sto.dir = (dir)?dir:"in"; + if (trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "in", 2) == 0) { + sto.toip = trace_local_ip; + } else { + siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); + strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); + strcat(sto.toip_buff,":"); + strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); + sto.toip.s = sto.toip_buff; + sto.toip.len = strlen(sto.toip_buff); + } } else { sto.body.s = snd_inf->buf; sto.body.len = snd_inf->len; - strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, - snd_inf->send_sock->sock_str.len); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + if (trace_local_ip.s && trace_local_ip.len > 0) { + sto.fromip = trace_local_ip; + } else { + strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, + snd_inf->send_sock->sock_str.len); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + } siptrace_copy_proto(snd_inf->send_sock->proto, sto.toip_buff); strcat(sto.toip_buff, suip2a(snd_inf->to, sizeof(*snd_inf->to)));

8 years, 8 months

[kamailio] siptrace: Use the trace_local_ip setting in sip_trace() (#524)

by Erik Davidson

In some cases the trace_local_ip wasn't being updated when sending out sip trace messages. This updates the cases I could find to use the trace_local_ip setting when needed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/524 -- Commit Summary -- * siptrace: Use the trace_local_ip setting in sip_trace() -- File Changes -- M modules/siptrace/siptrace.c (46) -- Patch Links -- https://github.com/kamailio/kamailio/pull/524.patch https://github.com/kamailio/kamailio/pull/524.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/524

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016