sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
296 discussions

git:master:dce9cea1: modules/ims_registrar_scscf: prevent possible deadlock when generating reginfo NOTIFY requests
by jaybeepee 13 Jan '16

13 Jan '16

Module: kamailio Branch: master Commit: dce9cea1744c458afae1088935f4c2549689c454 URL: https://github.com/kamailio/kamailio/commit/dce9cea1744c458afae1088935f4c25… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-01-13T11:12:37+02:00 modules/ims_registrar_scscf: prevent possible deadlock when generating reginfo NOTIFY requests - moved the actual processing of the implicit impu set to create the XML to a separate processing - seperate process will therefore pick up events, build the XML and send the NOTIFY/s - TODO: make framework capable of multiple workers to process events --- Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/dce9cea1744c458afae1088935f4c25… Patch: https://github.com/kamailio/kamailio/commit/dce9cea1744c458afae1088935f4c25…

1 0

git:master:a15affa4: modules/ims_usrloc_scscf, modules/ims_registrar_scscf: impus as string from subscription can be created in pkg or shm depending on argument passed
by jaybeepee 13 Jan '16

13 Jan '16

Module: kamailio Branch: master Commit: a15affa4d5f35cf2bfdd793b50010318f34f3f08 URL: https://github.com/kamailio/kamailio/commit/a15affa4d5f35cf2bfdd793b5001031… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-01-13T11:05:15+02:00 modules/ims_usrloc_scscf,modules/ims_registrar_scscf: impus as string from subscription can be created in pkg or shm depending on argument passed --- Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/udomain.h Modified: modules/ims_usrloc_scscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/a15affa4d5f35cf2bfdd793b5001031… Patch: https://github.com/kamailio/kamailio/commit/a15affa4d5f35cf2bfdd793b5001031…

1 0

git:master:072c8865: core: earlier execution of SREV_NET_DATA_RECV event
by Daniel-Constantin Mierla 12 Jan '16

12 Jan '16

Module: kamailio Branch: master Commit: 072c88653e280004f86b4c41cfc4d92f3b21af1d URL: https://github.com/kamailio/kamailio/commit/072c88653e280004f86b4c41cfc4d92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-12T14:09:54+01:00 core: earlier execution of SREV_NET_DATA_RECV event - allow capturing the traffic before topoh decodes it --- Modified: receive.c --- Diff: https://github.com/kamailio/kamailio/commit/072c88653e280004f86b4c41cfc4d92… Patch: https://github.com/kamailio/kamailio/commit/072c88653e280004f86b4c41cfc4d92… --- diff --git a/receive.c b/receive.c index a9e1fc3..1c65266 100644 --- a/receive.c +++ b/receive.c @@ -74,6 +74,39 @@ unsigned int inc_msg_no(void) return ++msg_no; } +/** + * + */ +int sip_check_fline(char* buf, unsigned int len) +{ + char *p; + int m; + + m = 0; + for(p=buf; p<buf+len; p++) { + /* first check if is a reply - starts with SIP/2.0 */ + if(m==0) { + if(*p==' ' || *p=='\t' || *p=='\r' || *p=='\n') continue; + if(buf+len-p<10) return -1; + if(strncmp(p, "SIP/2.0 ", 8)==0) { + LM_DBG("first line indicates a SIP reply\n"); + return 0; + } + m=1; + } else { + /* check if a request - before end of first line is SIP/2.0 */ + if(*p!='\r' && *p!='\n') continue; + if(p-10>=buf) { + if(strncmp(p-8, " SIP/2.0", 8)==0) { + LM_DBG("first line indicates a SIP request\n"); + return 0; + } + } + return -1; + } + } + return -1; +} /** Receive message * WARNING: buf must be 0 terminated (buf[len]=0) or some things might @@ -93,6 +126,16 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) str inb; sr_net_info_t netinfo; + if(sr_event_enabled(SREV_NET_DATA_RECV)) { + if(sip_check_fline(buf, len)==0) { + memset(&netinfo, 0, sizeof(sr_net_info_t)); + netinfo.data.s = buf; + netinfo.data.len = len; + netinfo.rcv = rcv_info; + sr_event_exec(SREV_NET_DATA_RECV, (void*)&netinfo); + } + } + inb.s = buf; inb.len = len; sr_event_exec(SREV_NET_DATA_IN, (void*)&inb); @@ -140,14 +183,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* ... clear branches from previous message */ clear_branches(); - if(sr_event_enabled(SREV_NET_DATA_RECV)) { - memset(&netinfo, 0, sizeof(sr_net_info_t)); - netinfo.data.s = msg->buf; - netinfo.data.len = msg->len; - netinfo.rcv = rcv_info; - sr_event_exec(SREV_NET_DATA_RECV, (void*)&netinfo); - } - if (msg->first_line.type==SIP_REQUEST){ ruri_mark_new(); /* ruri is usable for forking (not consumed yet) */ if (!IS_SIP(msg)){

1 0

git:master:142fb5a2: siptrace: readme regenerated
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 142fb5a289a6ff4b0cc631293f7acbb65414e889 URL: https://github.com/kamailio/kamailio/commit/142fb5a289a6ff4b0cc631293f7acbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T22:31:20+01:00 siptrace: readme regenerated --- Modified: modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/142fb5a289a6ff4b0cc631293f7acbb… Patch: https://github.com/kamailio/kamailio/commit/142fb5a289a6ff4b0cc631293f7acbb… --- diff --git a/modules/siptrace/README b/modules/siptrace/README index 5dfa7a7..7ee26f9 100644 --- a/modules/siptrace/README +++ b/modules/siptrace/README @@ -16,9 +16,9 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright (c) 2010 asipto.com + Copyright © 2010 asipto.com - Copyright (c) 2006 voice-system.ro + Copyright © 2006 voice-system.ro __________________________________________________________________ Table of Contents @@ -50,6 +50,7 @@ Daniel-Constantin Mierla 3.15. hep_capture_id (integer) 3.16. trace_delayed (integer) 3.17. force_send_sock (str) + 3.18. trace_mode (integer) 4. Functions @@ -85,7 +86,8 @@ Daniel-Constantin Mierla 1.15. Set hep_capture_id parameter 1.16. Set trace_delayed parameter 1.17. Set force_send_sock parameter - 1.18. sip_trace() usage + 1.18. Set trace_mode parameter + 1.19. sip_trace() usage Chapter 1. Admin Guide @@ -116,6 +118,7 @@ Chapter 1. Admin Guide 3.15. hep_capture_id (integer) 3.16. trace_delayed (integer) 3.17. force_send_sock (str) + 3.18. trace_mode (integer) 4. Functions @@ -190,6 +193,7 @@ Chapter 1. Admin Guide 3.15. hep_capture_id (integer) 3.16. trace_delayed (integer) 3.17. force_send_sock (str) + 3.18. trace_mode (integer) 3.1. db_url (str) @@ -420,11 +424,27 @@ modparam("siptrace", "trace_delayed", 1) modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") ... +3.18. trace_mode (integer) + + If set to 1, the module uses core events triggered when receiving or + sending SIP traffic to mirror traffic to a SIP capture server using + HEP. It will automatically do the mirroring of all traffic, no need to + set the siptrace flag per request. + + If set to 0, no automatic mirroring of SIP traffic via HEP. + + Default value is 0. + + Example 1.18. Set trace_mode parameter +... +modparam("siptrace", "trace_mode", 1) +... + 4. Functions 4.1. sip_trace([address]) -4.1. sip_trace([address]) +4.1. sip_trace([address]) Store or forward the current processed SIP message in database. It is stored in the form prior applying changes made to it. @@ -438,7 +458,7 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.18. sip_trace() usage + Example 1.19. sip_trace() usage ... sip_trace(); ... @@ -449,7 +469,7 @@ sip_trace("sip:10.1.1.2:5085"); 5.1. sip_trace -5.1. sip_trace +5.1. sip_trace Name: sip_trace @@ -470,7 +490,7 @@ sip_trace("sip:10.1.1.2:5085"); 6.1. siptrace.status param -6.1. siptrace.status param +6.1. siptrace.status param Name: siptrace.status

1 0

git:master:2d2c0bec: siptrace: documented trace_mode parameter
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 2d2c0bec3170b3ef6c10dc9a3b9e990b8d50e0bc URL: https://github.com/kamailio/kamailio/commit/2d2c0bec3170b3ef6c10dc9a3b9e990… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T22:30:09+01:00 siptrace: documented trace_mode parameter --- Modified: modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2d2c0bec3170b3ef6c10dc9a3b9e990… Patch: https://github.com/kamailio/kamailio/commit/2d2c0bec3170b3ef6c10dc9a3b9e990… --- diff --git a/modules/siptrace/doc/siptrace_admin.xml b/modules/siptrace/doc/siptrace_admin.xml index c766531..7c454f7 100644 --- a/modules/siptrace/doc/siptrace_admin.xml +++ b/modules/siptrace/doc/siptrace_admin.xml @@ -469,6 +469,30 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") </programlisting> </example> </section> + <section id="siptrace.p.trace_mode"> + <title><varname>trace_mode</varname> (integer)</title> + <para> + If set to 1, the module uses core events triggered when receiving + or sending SIP traffic to mirror traffic to a SIP capture server + using HEP. It will automatically do the mirroring of all traffic, + no need to set the siptrace flag per request. + </para> + <para> + If set to 0, no automatic mirroring of SIP traffic via HEP. + </para> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>trace_mode</varname> + parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "trace_mode", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:57e7b28b: siptrace: use SREV_NET_DATA_RECV event for incoming traffic with trace_mode=1
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 57e7b28bd811971f16154cee08acc2d2024dee76 URL: https://github.com/kamailio/kamailio/commit/57e7b28bd811971f16154cee08acc2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T22:24:28+01:00 siptrace: use SREV_NET_DATA_RECV event for incoming traffic with trace_mode=1 --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/57e7b28bd811971f16154cee08acc2d… Patch: https://github.com/kamailio/kamailio/commit/57e7b28bd811971f16154cee08acc2d… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 7c689c3..613ea31 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -107,6 +107,7 @@ static void trace_sl_ack_in(sl_cbp_t *slcb); static int trace_send_hep_duplicate(str *body, str *from, str *to, struct dest_info*); static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int *proto); +int siptrace_net_data_recv(void *data); int siptrace_net_data_send(void *data); static int _siptrace_mode = 0; @@ -454,6 +455,7 @@ static int mod_init(void) } if(_siptrace_mode==1) { + sr_event_register_cb(SREV_NET_DATA_RECV, siptrace_net_data_recv); sr_event_register_cb(SREV_NET_DATA_SEND, siptrace_net_data_send); } return 0; @@ -1914,6 +1916,48 @@ static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int return -1; } + +/** + * + */ +int siptrace_net_data_recv(void *data) +{ + sr_net_info_t *nd; + struct _siptrace_data sto; + + if(data==0) + return -1; + + nd = (sr_net_info_t*)data; + if(nd->rcv==NULL || nd->data.s==NULL || nd->data.len<=0) + return -1; + + memset(&sto, 0, sizeof(struct _siptrace_data)); + + sto.body.s = nd->data.s; + sto.body.len = nd->data.len; + + siptrace_copy_proto(nd->rcv->proto, sto.fromip_buff); + strcat(sto.fromip_buff, ip_addr2a(&nd->rcv->src_ip)); + strcat(sto.fromip_buff,":"); + strcat(sto.fromip_buff, int2str(nd->rcv->src_port, NULL)); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + + siptrace_copy_proto(nd->rcv->proto, sto.toip_buff); + strcat(sto.toip_buff, ip_addr2a(&nd->rcv->dst_ip)); + strcat(sto.toip_buff,":"); + strcat(sto.toip_buff, int2str(nd->rcv->dst_port, NULL)); + sto.toip.s = sto.toip_buff; + sto.toip.len = strlen(sto.toip_buff); + + sto.dir = "in"; + + trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL); + return 0; + +} + /** * */

1 0

git:master:4fc96976: core: execute SREV_NET_DATA_RECV event
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 4fc969760d8eec6355ce661ccd3c5fd9ad2a36f0 URL: https://github.com/kamailio/kamailio/commit/4fc969760d8eec6355ce661ccd3c5fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T22:24:28+01:00 core: execute SREV_NET_DATA_RECV event --- Modified: receive.c --- Diff: https://github.com/kamailio/kamailio/commit/4fc969760d8eec6355ce661ccd3c5fd… Patch: https://github.com/kamailio/kamailio/commit/4fc969760d8eec6355ce661ccd3c5fd… --- diff --git a/receive.c b/receive.c index 8a633cd..a9e1fc3 100644 --- a/receive.c +++ b/receive.c @@ -91,6 +91,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) unsigned int diff; #endif str inb; + sr_net_info_t netinfo; inb.s = buf; inb.len = len; @@ -139,6 +140,14 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* ... clear branches from previous message */ clear_branches(); + if(sr_event_enabled(SREV_NET_DATA_RECV)) { + memset(&netinfo, 0, sizeof(sr_net_info_t)); + netinfo.data.s = msg->buf; + netinfo.data.len = msg->len; + netinfo.rcv = rcv_info; + sr_event_exec(SREV_NET_DATA_RECV, (void*)&netinfo); + } + if (msg->first_line.type==SIP_REQUEST){ ruri_mark_new(); /* ruri is usable for forking (not consumed yet) */ if (!IS_SIP(msg)){

1 0

git:master:34afdb98: core: new event SREV_NET_DATA_RECV
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 34afdb987d55d984da49b5896649cea1fc3d075b URL: https://github.com/kamailio/kamailio/commit/34afdb987d55d984da49b5896649cea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T22:24:28+01:00 core: new event SREV_NET_DATA_RECV - to be executed if a sip message has been received --- Modified: events.c Modified: events.h --- Diff: https://github.com/kamailio/kamailio/commit/34afdb987d55d984da49b5896649cea… Patch: https://github.com/kamailio/kamailio/commit/34afdb987d55d984da49b5896649cea… --- diff --git a/events.c b/events.c index b140b61..d2e3286 100644 --- a/events.c +++ b/events.c @@ -170,6 +170,11 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.tcp_closed = f; else return -1; break; + case SREV_NET_DATA_RECV: + if(_sr_events_list.net_data_recv==0) + _sr_events_list.net_data_recv = f; + else return -1; + break; case SREV_NET_DATA_SEND: if(_sr_events_list.net_data_send==0) _sr_events_list.net_data_send = f; @@ -300,6 +305,12 @@ int sr_event_exec(int type, void *data) ret = _sr_events_list.tcp_closed(data); return ret; } else return 1; + case SREV_NET_DATA_RECV: + if(unlikely(_sr_events_list.net_data_recv!=0)) + { + ret = _sr_events_list.net_data_recv(data); + return ret; + } else return 1; case SREV_NET_DATA_SEND: if(unlikely(_sr_events_list.net_data_send!=0)) { @@ -343,6 +354,8 @@ int sr_event_enabled(int type) return (_sr_events_list.rcv_nosip!=0)?1:0; case SREV_TCP_CLOSED: return (_sr_events_list.tcp_closed!=0)?1:0; + case SREV_NET_DATA_RECV: + return (_sr_events_list.net_data_recv!=0)?1:0; case SREV_NET_DATA_SEND: return (_sr_events_list.net_data_send!=0)?1:0; } diff --git a/events.h b/events.h index 86ab784..60d53d7 100644 --- a/events.h +++ b/events.h @@ -35,7 +35,8 @@ #define SREV_TCP_WS_FRAME_OUT 11 #define SREV_STUN_IN 12 #define SREV_TCP_CLOSED 13 -#define SREV_NET_DATA_SEND 14 +#define SREV_NET_DATA_RECV 14 +#define SREV_NET_DATA_SEND 15 #define SREV_CB_LIST_SIZE 3 @@ -55,6 +56,7 @@ typedef struct sr_event_cb { sr_event_cb_f stun_in; sr_event_cb_f rcv_nosip; sr_event_cb_f tcp_closed; + sr_event_cb_f net_data_recv; sr_event_cb_f net_data_send; } sr_event_cb_t;

1 0

git:master:b57a2d78: core: relocated sr_net_info_t struct for availability
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: b57a2d7815ad374ba799af4b02c3bccd7942d539 URL: https://github.com/kamailio/kamailio/commit/b57a2d7815ad374ba799af4b02c3bcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T22:24:28+01:00 core: relocated sr_net_info_t struct for availability --- Modified: forward.h Modified: ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/b57a2d7815ad374ba799af4b02c3bcc… Patch: https://github.com/kamailio/kamailio/commit/b57a2d7815ad374ba799af4b02c3bcc… --- diff --git a/forward.h b/forward.h index 537d378..9c15236 100644 --- a/forward.h +++ b/forward.h @@ -56,10 +56,6 @@ enum ss_mismatch { SS_MISMATCH_MCAST /* mcast forced send socket */ }; -typedef struct sr_send_info { - str data; - struct dest_info* dst; -} sr_net_info_t; struct socket_info* get_send_socket2(struct socket_info* force_send_socket, union sockaddr_union* su, int proto, diff --git a/ip_addr.h b/ip_addr.h index 20176b0..c2b724c 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -136,6 +136,11 @@ struct receive_info{ /* no need for dst_su yet */ }; +typedef struct sr_net_info { + str data; + struct dest_info* dst; + struct receive_info* rcv; +} sr_net_info_t; /* send flags */ #define SND_F_FORCE_CON_REUSE 1 /* reuse an existing connection or fail */

1 0

[kamailio] kamailio sending update ccr request instead of terminate request for initial ccr response having final_unit_action flag. (#467)
by DileepNunna 11 Jan '16

11 Jan '16

If final_unit_action flag is set in initial ccr response, kamailio need to send terminate request after time out but it is sending update request.but it is fine for intermediate requests. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/467 -- Commit Summary -- * If final_unit_action flag is set in initial ccr response, kamailio need to send terminate request after time out but it is sending update request.but it is fine for intermediate requests. -- File Changes -- M modules/ims_charging/ims_ro.c (3) M modules/ims_charging/ro_session_hash.h (1) M modules/ims_charging/ro_timer.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/467.patch https://github.com/kamailio/kamailio/pull/467.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/467

4 5

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016