sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
296 discussions

git:master:581912f5: ims_charging: Properly check final_unit_action-flag for initial requests
by Carsten Bock 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 581912f5ed117bb56087668aa7ac60a7b667d525 URL: https://github.com/kamailio/kamailio/commit/581912f5ed117bb56087668aa7ac60a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2016-01-11T15:14:37+01:00 ims_charging: Properly check final_unit_action-flag for initial requests If final_unit_action flag is set in initial ccr response, kamailio need to send terminate request after the granted time instead of sending an CCR-UPDATE request. Patch by DileepNunna <dileepn30(a)gmail.com> Closes Github #467 (Kamailio sending update ccr request instead of terminate request for initial ccr response having final_unit_action flag) --- Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/ro_session_hash.h Modified: modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/581912f5ed117bb56087668aa7ac60a… Patch: https://github.com/kamailio/kamailio/commit/581912f5ed117bb56087668aa7ac60a… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index adb536d..8864788 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -1255,6 +1255,10 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, ssd->ro_session->event_type = pending; ssd->ro_session->reserved_secs = ro_cca_data->mscc->granted_service_unit->cc_time; ssd->ro_session->valid_for = ro_cca_data->mscc->validity_time; + ssd->ro_session->is_final_allocation = 0; + + if (ro_cca_data->mscc->final_unit_action && (ro_cca_data->mscc->final_unit_action->action == 0)) + ssd->ro_session->is_final_allocation = 1; Ro_free_CCA(ro_cca_data); diff --git a/modules/ims_charging/ro_session_hash.h b/modules/ims_charging/ro_session_hash.h index 7aa1b89..fa92ed9 100644 --- a/modules/ims_charging/ro_session_hash.h +++ b/modules/ims_charging/ro_session_hash.h @@ -71,6 +71,7 @@ struct ro_session { str mac; int rating_group; int service_identifier; + unsigned int is_final_allocation; }; /*! entries in the main ro_session table */ diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index f5978d6..40f3c42 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -400,6 +400,19 @@ void ro_session_ontimeout(struct ro_tl *tl) { // return; // } + + if(ro_session->is_final_allocation) { + now = get_current_time_micro(); + used_secs = now - ro_session->last_event_timestamp; + if((ro_session->reserved_secs - used_secs) > 0) { + update_ro_timer(&ro_session->ro_tl, (ro_session->reserved_secs - used_secs)); + return; + } + else { + ro_session->event_type = no_more_credit; + } + } + switch (ro_session->event_type) { case answered: now = get_current_time_micro();

1 0

git:master:1771f7e4: siptrace: new parameter trace_mode
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 1771f7e489b060290b38fc0a428058ca7e2b5f42 URL: https://github.com/kamailio/kamailio/commit/1771f7e489b060290b38fc0a428058c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T12:41:48+01:00 siptrace: new parameter trace_mode - if set to 1, is using the SREV_NET_DATA_SEND event for sending HEP packets to sipcapture server for packets sent to the network --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/1771f7e489b060290b38fc0a428058c… Patch: https://github.com/kamailio/kamailio/commit/1771f7e489b060290b38fc0a428058c… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 158d2f1..7c689c3 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -50,6 +50,7 @@ #include "../../modules/sl/sl.h" #include "../../str.h" #include "../../onsend.h" +#include "../../events.h" #include "../../modules/sipcapture/hep.h" @@ -106,6 +107,9 @@ 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_send(void *data); +static int _siptrace_mode = 0; + static struct mi_root* sip_trace_mi(struct mi_root* cmd, void* param ); @@ -211,6 +215,7 @@ static param_export_t params[] = { {"hep_version", INT_PARAM, &hep_version }, {"hep_capture_id", INT_PARAM, &hep_capture_id }, {"trace_delayed", INT_PARAM, &trace_delayed }, + {"trace_mode", PARAM_INT, &_siptrace_mode }, {0, 0, 0} }; @@ -448,6 +453,9 @@ static int mod_init(void) trace_table_avp_type = 0; } + if(_siptrace_mode==1) { + sr_event_register_cb(SREV_NET_DATA_SEND, siptrace_net_data_send); + } return 0; } @@ -1906,6 +1914,53 @@ static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int return -1; } +/** + * + */ +int siptrace_net_data_send(void *data) +{ + sr_net_info_t *nd; + struct dest_info new_dst; + struct _siptrace_data sto; + + if(data==0) + return -1; + + nd = (sr_net_info_t*)data; + if(nd->dst==NULL || nd->data.s==NULL || nd->data.len<=0) + return -1; + + new_dst=*nd->dst; + new_dst.send_sock=get_send_socket(0, &nd->dst->to, nd->dst->proto); + + memset(&sto, 0, sizeof(struct _siptrace_data)); + + sto.body.s = nd->data.s; + sto.body.len = nd->data.len; + + if (unlikely(new_dst.send_sock==0)) { + LM_WARN("no sending socket found\n"); + strcpy(sto.fromip_buff, "any:255.255.255.255:5060"); + } else { + strncpy(sto.fromip_buff, new_dst.send_sock->sock_str.s, + new_dst.send_sock->sock_str.len); + } + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + + siptrace_copy_proto(new_dst.send_sock->proto, sto.toip_buff); + strcat(sto.toip_buff, suip2a(&new_dst.to, sizeof(new_dst.to))); + strcat(sto.toip_buff,":"); + strcat(sto.toip_buff, int2str((int)su_getport(&new_dst.to), NULL)); + sto.toip.s = sto.toip_buff; + sto.toip.len = strlen(sto.toip_buff); + + sto.dir = "out"; + + trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL); + return 0; +} + static void siptrace_rpc_status (rpc_t* rpc, void* c) { str status = {0, 0}; @@ -1956,4 +2011,3 @@ static int siptrace_init_rpc(void) } return 0; } -

1 0

git:master:53529269: core: execute event SREV_NET_DATA_SEND if data was sent to network
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 53529269d88adf140985192cd4ba6e8174fcc231 URL: https://github.com/kamailio/kamailio/commit/53529269d88adf140985192cd4ba6e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T12:40:59+01:00 core: execute event SREV_NET_DATA_SEND if data was sent to network --- Modified: forward.h --- Diff: https://github.com/kamailio/kamailio/commit/53529269d88adf140985192cd4ba6e8… Patch: https://github.com/kamailio/kamailio/commit/53529269d88adf140985192cd4ba6e8… --- diff --git a/forward.h b/forward.h index 9c075b8..537d378 100644 --- a/forward.h +++ b/forward.h @@ -56,6 +56,11 @@ 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, enum ss_mismatch* mismatch); @@ -119,6 +124,8 @@ static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len, { struct dest_info new_dst; str outb; + sr_net_info_t netinfo; + #ifdef USE_TCP int port; struct ip_addr ip; @@ -271,6 +278,15 @@ static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len, } ret = 0; done: + + if(!(flags&1)) { + memset(&netinfo, 0, sizeof(sr_net_info_t)); + netinfo.data.s = outb.s; + netinfo.data.len = outb.len; + netinfo.dst = dst; + sr_event_exec(SREV_NET_DATA_SEND, (void*)&netinfo); + } + if(outb.s != buf) pkg_free(outb.s); return ret;

1 0

git:master:1f00d722: core: new event SREV_NET_DATA_SEND
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 1f00d722aaefbd2515ae69ffdcf541143862d9fd URL: https://github.com/kamailio/kamailio/commit/1f00d722aaefbd2515ae69ffdcf5411… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T12:39:59+01:00 core: new event SREV_NET_DATA_SEND - to be executed if message was sent to the network --- Modified: events.c Modified: events.h --- Diff: https://github.com/kamailio/kamailio/commit/1f00d722aaefbd2515ae69ffdcf5411… Patch: https://github.com/kamailio/kamailio/commit/1f00d722aaefbd2515ae69ffdcf5411… --- diff --git a/events.c b/events.c index bb1373a..b140b61 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_SEND: + if(_sr_events_list.net_data_send==0) + _sr_events_list.net_data_send = f; + else return -1; + break; default: return -1; } @@ -295,6 +300,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_SEND: + if(unlikely(_sr_events_list.net_data_send!=0)) + { + ret = _sr_events_list.net_data_send(data); + return ret; + } else return 1; default: return -1; } @@ -332,6 +343,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_SEND: + return (_sr_events_list.net_data_send!=0)?1:0; } return 0; } diff --git a/events.h b/events.h index 2946d94..86ab784 100644 --- a/events.h +++ b/events.h @@ -35,6 +35,7 @@ #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_CB_LIST_SIZE 3 @@ -54,6 +55,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_send; } sr_event_cb_t; void sr_event_cb_init(void);

1 0

git:master:8b384708: tls: regenerated the readme file
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 8b3847085e793596528d4675acce467a2e7629b7 URL: https://github.com/kamailio/kamailio/commit/8b3847085e793596528d4675acce467… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T11:37:29+01:00 tls: regenerated the readme file --- Modified: modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/8b3847085e793596528d4675acce467… Patch: https://github.com/kamailio/kamailio/commit/8b3847085e793596528d4675acce467… --- diff --git a/modules/tls/README b/modules/tls/README index e684498..da74077 100644 --- a/modules/tls/README +++ b/modules/tls/README @@ -1306,8 +1306,10 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") 11.4. tls.reload - Reload the external TLS configuration file. (Does not reload modparam() - parameters) + Reload the external TLS configuration file (aka tls.cfg). It does not + reload modparam() parameters. Note that existing active TLS connections + are not terminated and they continue to use the old certificates. New + configuration will be used for new connections. Parameters: * None.

1 0

git:master:59ce5597: tls: more details about tls.cfg reload
by Daniel-Constantin Mierla 11 Jan '16

11 Jan '16

Module: kamailio Branch: master Commit: 59ce55977e91c399b86177060421d32dbbd7be06 URL: https://github.com/kamailio/kamailio/commit/59ce55977e91c399b86177060421d32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-11T11:37:07+01:00 tls: more details about tls.cfg reload --- Modified: modules/tls/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/59ce55977e91c399b86177060421d32… Patch: https://github.com/kamailio/kamailio/commit/59ce55977e91c399b86177060421d32… --- diff --git a/modules/tls/doc/rpc.xml b/modules/tls/doc/rpc.xml index 5efbdee..48b7f6a 100644 --- a/modules/tls/doc/rpc.xml +++ b/modules/tls/doc/rpc.xml @@ -53,8 +53,10 @@ <section id="tls.r.tls.reload"> <title><function>tls.reload</function></title> <para> - Reload the external TLS configuration file. (Does not reload - modparam() parameters) + Reload the external TLS configuration file (aka tls.cfg). It does not reload + modparam() parameters. Note that existing active TLS connections are not + terminated and they continue to use the old certificates. New configuration + will be used for new connections. </para> <para>Parameters: </para> <itemizedlist>

1 0

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

08 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 requestbut it is fine for intermediate requests Attached file for fixing the issue [fixtxt](https://githubcom/kamailio/kamailio/files/80008/fixtxt) --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/464

2 3

git:master:30222067: Merge pull request #470 from ianlin/master
by Daniel-Constantin Mierla 08 Jan '16

08 Jan '16

Module: kamailio Branch: master Commit: 3022206747eaabc17ec711d955987a02b82e87e9 URL: https://github.com/kamailio/kamailio/commit/3022206747eaabc17ec711d955987a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-08T15:02:26+01:00 Merge pull request #470 from ianlin/master registrar: do make use of reg_xavp_cfg --- Modified: modules/registrar/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3022206747eaabc17ec711d955987a0… Patch: https://github.com/kamailio/kamailio/commit/3022206747eaabc17ec711d955987a0… --- diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index 98b136b..0d7c5ac 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -362,8 +362,14 @@ static int mod_init(void) sock_hdr_name.len = 0; sock_flag = -1; } + } else if (reg_xavp_cfg.s) { + if (reg_xavp_cfg.len == 0 || sock_flag == -1) { + LM_WARN("empty reg_xavp_cfg or sock_flag no set -> resetting\n"); + reg_xavp_cfg.len = 0; + sock_flag = -1; + } } else if (sock_flag!=-1) { - LM_WARN("sock_flag defined but no sock_hdr_name -> reseting flag\n"); + LM_WARN("sock_flag defined but no sock_hdr_name or no reg_xavp_cfg -> resetting flag\n"); sock_flag = -1; }

1 0

git:master:c46a5f27: registrar: do make use of reg_xavp_cfg
by Ian Yu-Hsun Lin 08 Jan '16

08 Jan '16

Module: kamailio Branch: master Commit: c46a5f2792b8553ade871d98cfe892c5a48a3ff6 URL: https://github.com/kamailio/kamailio/commit/c46a5f2792b8553ade871d98cfe892c… Author: Ian Yu-Hsun Lin <ianyuhsunlin(a)gmail.com> Committer: Ian Yu-Hsun Lin <ianyuhsunlin(a)gmail.com> Date: 2016-01-07T19:10:51+08:00 registrar: do make use of reg_xavp_cfg - prevent from resetting sock_flag to -1 when reg_xavp_cfg is set --- Modified: modules/registrar/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c46a5f2792b8553ade871d98cfe892c… Patch: https://github.com/kamailio/kamailio/commit/c46a5f2792b8553ade871d98cfe892c… --- diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index 98b136b..0d7c5ac 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -362,8 +362,14 @@ static int mod_init(void) sock_hdr_name.len = 0; sock_flag = -1; } + } else if (reg_xavp_cfg.s) { + if (reg_xavp_cfg.len == 0 || sock_flag == -1) { + LM_WARN("empty reg_xavp_cfg or sock_flag no set -> resetting\n"); + reg_xavp_cfg.len = 0; + sock_flag = -1; + } } else if (sock_flag!=-1) { - LM_WARN("sock_flag defined but no sock_hdr_name -> reseting flag\n"); + LM_WARN("sock_flag defined but no sock_hdr_name or no reg_xavp_cfg -> resetting flag\n"); sock_flag = -1; }

1 0

git:4.3:f42fa2e7: Merge pull request #474 from adubovikov/4.3
by Alexandr Dubovikov 08 Jan '16

08 Jan '16

Module: kamailio Branch: 4.3 Commit: f42fa2e7d958e47764020b0a6fc49941f8c12015 URL: https://github.com/kamailio/kamailio/commit/f42fa2e7d958e47764020b0a6fc4994… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-01-08T14:34:23+01:00 Merge pull request #474 from adubovikov/4.3 fixed correlation_id --- Modified: modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/f42fa2e7d958e47764020b0a6fc4994… Patch: https://github.com/kamailio/kamailio/commit/f42fa2e7d958e47764020b0a6fc4994… --- diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index c0a1791..2578d4f 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -274,6 +274,8 @@ int parsing_hepv3_message(char *buf, unsigned int len) { src_ip.af = 0; payload = NULL; + correlation_id = NULL; + authkey = NULL; i = sizeof(hep_ctrl_t);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
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