sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
273 discussions

git:4.3:626de5da: ims_charging: In case of Tel-URIs, use type END_USER_E164 and STRIP tel: (Bugfix)

by Carsten Bock

Module: kamailio Branch: 4.3 Commit: 626de5dac2715507c5fb19f8056183b4ca6a1da8 URL: https://github.com/kamailio/kamailio/commit/626de5dac2715507c5fb19f8056183b… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-06-08T13:48:04+02:00 ims_charging: In case of Tel-URIs, use type END_USER_E164 and STRIP tel: (Bugfix) --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/626de5dac2715507c5fb19f8056183b… Patch: https://github.com/kamailio/kamailio/commit/626de5dac2715507c5fb19f8056183b… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 7215036..ab2488a 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -547,6 +547,9 @@ void send_ccr_interim(struct ro_session* ro_session, unsigned int used, unsigned //getting subscription id type if (strncasecmp(subscr.id.s, "tel:", 4) == 0) { subscr.type = Subscription_Type_MSISDN; + // Strip "tel:": + subscr.id.s += 4; + subscr.id.len -= 4; } else { subscr.type = Subscription_Type_IMPU; //default is END_USER_SIP_URI } @@ -780,6 +783,9 @@ void send_ccr_stop(struct ro_session *ro_session) { //getting subscription id type if (strncasecmp(subscr.id.s, "tel:", 4) == 0) { subscr.type = Subscription_Type_MSISDN; + // Strip "tel:": + subscr.id.s += 4; + subscr.id.len -= 4; } else { subscr.type = Subscription_Type_IMPU; //default is END_USER_SIP_URI } @@ -996,6 +1002,9 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, int reservat //getting subscription id type if (strncasecmp(subscription_id.s, "tel:", 4) == 0) { subscription_id_type = Subscription_Type_MSISDN; + // Strip "tel:": + subscription_id.s += 4; + subscription_id.len -= 4; } else { subscription_id_type = Subscription_Type_IMPU; //default is END_USER_SIP_URI }

9 years, 6 months

git:master:867a29d8: modules/cdp: CER/CEA retry if send/receive FD disappeared

by jaybeepee

Module: kamailio Branch: master Commit: 867a29d80aebaddaa0e1c960b9e1d459b7a9fb4d URL: https://github.com/kamailio/kamailio/commit/867a29d80aebaddaa0e1c960b9e1d45… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-06-08T11:43:50+02:00 modules/cdp: CER/CEA retry if send/receive FD disappeared - typically useful in edge cases where disk is full and/or FDs are deleted --- Modified: modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/867a29d80aebaddaa0e1c960b9e1d45… Patch: https://github.com/kamailio/kamailio/commit/867a29d80aebaddaa0e1c960b9e1d45… --- diff --git a/modules/cdp/peerstatemachine.c b/modules/cdp/peerstatemachine.c index 3955d2c..375443b 100644 --- a/modules/cdp/peerstatemachine.c +++ b/modules/cdp/peerstatemachine.c @@ -615,9 +615,11 @@ static inline void Snd_CE_add_applications(AAAMessage *msg,peer *p) */ void I_Snd_CER(peer *p) { + int retries = 3; AAAMessage *cer=0; // AAA_AVP *avp; unsigned long ip; + peer_event_t next_event; union { struct sockaddr addr; struct sockaddr_in in; @@ -631,8 +633,19 @@ void I_Snd_CER(peer *p) cer->hopbyhopId = next_hopbyhop(); cer->endtoendId = next_endtoend(); addrlen = sizeof(addr_u); - if (getsockname(p->I_sock,&(addr_u.addr), &addrlen) == -1) { + +retry: if (getsockname(p->I_sock,&(addr_u.addr), &addrlen) == -1) { LM_ERR("I_Snd_CER(): Error on finding local host address > %s\n",strerror(errno)); + //try and create a new FD + if (retries > 0) { + p->state = Wait_Conn_Ack; + next_event = I_Snd_Conn_Req(p); + if (next_event==I_Rcv_Conn_NAck) { + sm_process(p, next_event, 0, 1, p->I_sock); + retries--; + goto retry; + } + } }else{ switch(addr_u.addr.sa_family){ case AF_INET: @@ -992,8 +1005,10 @@ int Process_CER(peer *p,AAAMessage *cer) */ void Snd_CEA(peer *p,AAAMessage *cer,int result_code,int sock) { + int retries=3; AAAMessage *cea; unsigned int ip; + peer_event_t next_event; union { struct sockaddr addr; struct sockaddr_in in; @@ -1006,8 +1021,18 @@ void Snd_CEA(peer *p,AAAMessage *cer,int result_code,int sock) if (!cea) goto done; addrlen = sizeof(addr_u); - if (getsockname(sock, &(addr_u.addr), &addrlen) == -1) { +retry: if (getsockname(sock, &(addr_u.addr), &addrlen) == -1) { LM_ERR("Snd_CEA(): Error on finding local host address > %s\n",strerror(errno)); + //try and create a new FD + if (retries > 0) { + p->state = Wait_Conn_Ack; + next_event = I_Snd_Conn_Req(p); + if (next_event==I_Rcv_Conn_NAck) { + sm_process(p, next_event, 0, 1, p->I_sock); + retries--; + goto retry; + } + } }else{ switch(addr_u.addr.sa_family){ case AF_INET:

9 years, 6 months

git:master:1112649b: modules/cdp: added class of auth session to know more info about auth session

by jaybeepee

Module: kamailio Branch: master Commit: 1112649ba73606644ff427041ab5de4d5b6e88a5 URL: https://github.com/kamailio/kamailio/commit/1112649ba73606644ff427041ab5de4… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-06-08T11:37:48+02:00 modules/cdp: added class of auth session to know more info about auth session - for example: ims_qos can now report Rx session for Reg or for media - useful for reporting CDP session and which class they belong to --- Modified: modules/cdp/session.c Modified: modules/cdp/session.h Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1112649ba73606644ff427041ab5de4… Patch: https://github.com/kamailio/kamailio/commit/1112649ba73606644ff427041ab5de4… --- diff --git a/modules/cdp/session.c b/modules/cdp/session.c index f3399f9..c048a05 100644 --- a/modules/cdp/session.c +++ b/modules/cdp/session.c @@ -403,12 +403,13 @@ void cdp_sessions_log() switch (x->type){ case AUTH_CLIENT_STATEFULL: case AUTH_SERVER_STATEFULL: - LM_DBG(ANSI_GRAY"\tAuth State [%d] Timeout [%d] Lifetime [%d] Grace [%d] Generic [%p]\n", + LM_DBG(ANSI_GRAY"\tAuth State [%d] Timeout [%d] Lifetime [%d] Grace [%d] Generic [%p] Class [%d]\n", x->u.auth.state, (int)(x->u.auth.timeout-time(0)), x->u.auth.lifetime?(int)(x->u.auth.lifetime-time(0)):-1, (int)(x->u.auth.grace_period), - x->u.auth.generic_data); + x->u.auth.generic_data, + x->u.auth.class); break; case ACCT_CC_CLIENT: LM_DBG(ANSI_GRAY"\tCCAcct State [%d] Charging Active [%c (%d)s] Reserved Units(valid=%ds) [%d] Generic [%p]\n", @@ -585,6 +586,7 @@ AAASession* cdp_new_auth_session(str id,int is_client,int is_statefull) s->u.auth.timeout=time(0)+config->default_auth_session_timeout; s->u.auth.lifetime=0; s->u.auth.grace_period=0; + s->u.auth.class = AUTH_CLASS_UNKNOWN; cdp_add_session(s); } return s; diff --git a/modules/cdp/session.h b/modules/cdp/session.h index fcacc8c..11adc86 100644 --- a/modules/cdp/session.h +++ b/modules/cdp/session.h @@ -110,13 +110,20 @@ typedef enum { AUTH_EV_SESSION_DROP =25, } cdp_auth_event; +/** Accounting states definition */ +typedef enum { + AUTH_CLASS_UNKNOWN = 0, + AUTH_CLASS_RXREG = 1, + AUTH_CLASS_RXMEDIA = 2 +} cdp_auth_session_class_t; + /** structure for auth session */ typedef struct _cdp_auth_session_t { - cdp_auth_state state; /**< current state */ - + cdp_auth_state state; /**< current state */ + cdp_auth_session_class_t class; /**< useful to know if this is Rx reg or Rx media for example */ time_t timeout; /**< absolute time for session timeout -1 means forever */ time_t lifetime; /**< absolute time for auth lifetime -1 means forever */ - time_t grace_period; /**< grace_period in seconds */ + time_t grace_period; /**< grace_period in seconds */ void* generic_data; } cdp_auth_session_t; diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index 78010cb..be73856 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -358,6 +358,10 @@ void callback_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params * para int new_has_video = 0; int must_unlock_aaa = 1; + if (rx_session_id==0) { + LM_WARN("Strange... no rx session ID in callback.... why?\n"); + return; + } //getting session data LM_DBG("Dialog callback of type %d received\n", type); @@ -857,6 +861,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int } goto error; } + auth_session->u.auth.class = AUTH_CLASS_RXMEDIA; //attach new cdp auth session to dlg for this direction if (dlg_direction == DLG_MOBILE_ORIGINATING) { @@ -1101,6 +1106,7 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* lock_release(saved_t_data->lock); goto error; } + auth->u.auth.class = AUTH_CLASS_RXREG; } //we are ready to send the AAR async. lets save the local data data

9 years, 6 months

Kamailio crash due to EOF on FD?

by Alex Balashov

Hello, I just got a crash of 4.2:61d84c020e35d529ba6782628a66af7c4a8df4a2 under these circumstances: Jun 5 10:00:05 kam /usr/local/sbin/kamailio[16214]: CRITICAL: <core> [pass_fd.c:293]: receive_fd(): EOF on 19 Jun 5 10:00:05 kam /usr/local/sbin/kamailio[16161]: ALERT: <core> [main.c:784]: handle_sigs(): child process 16181 exited by a signal 11 Jun 5 10:00:05 kam /usr/local/sbin/kamailio[16161]: ALERT: <core> [main.c:787]: handle_sigs(): core was not generated Jun 5 10:00:05 kam /usr/local/sbin/kamailio[16161]: INFO: <core> [main.c:799]: handle_sigs(): terminating due to SIGCHLD I have no core dump, unfortunately. Any idea why this might've happened? -- Alex Balashov | Principal | Evariste Systems LLC 303 Perimeter Center North, Suite 300 Atlanta, GA 30346 United States Tel: +1-800-250-5920 (toll-free) / +1-678-954-0671 (direct) Web: http://www.evaristesys.com/, http://www.csrpswitch.com/

9 years, 6 months

git:master:f8f40045: core: resolve negative index for dset before checking if it is last branch

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f8f40045e1370002076f568a1e73e0b4b67e9d66 URL: https://github.com/kamailio/kamailio/commit/f8f40045e1370002076f568a1e73e0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-05T11:42:06+02:00 core: resolve negative index for dset before checking if it is last branch - faster dropping of last branch --- Modified: dset.c --- Diff: https://github.com/kamailio/kamailio/commit/f8f40045e1370002076f568a1e73e0b… Patch: https://github.com/kamailio/kamailio/commit/f8f40045e1370002076f568a1e73e0b… --- diff --git a/dset.c b/dset.c index 2fb3b70..46cc40d 100644 --- a/dset.c +++ b/dset.c @@ -122,14 +122,14 @@ int drop_sip_branch(int idx) return 0; if(idx<0 && (int)nr_branches+idx<0) return 0; + if(idx<0) + idx += nr_branches; /* last branch */ if(idx==nr_branches-1) { nr_branches--; return 0; } - if(idx<0) - idx = nr_branches+idx; /* shift back one position */ for(; idx<nr_branches-1; idx++) memcpy(&branches[idx], &branches[idx+1], sizeof(branch_t));

9 years, 6 months

git:master:6461b799: pv: convert negative index to positive position for $branch(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6461b799ce64315b72b8e2f4f7e4617603330833 URL: https://github.com/kamailio/kamailio/commit/6461b799ce64315b72b8e2f4f7e4617… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-05T11:41:21+02:00 pv: convert negative index to positive position for $branch(...) - better access to branch structures --- Modified: modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/6461b799ce64315b72b8e2f4f7e4617… Patch: https://github.com/kamailio/kamailio/commit/6461b799ce64315b72b8e2f4f7e4617… --- diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index e35330a..34626b3 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -133,6 +133,16 @@ int pv_set_branchx_helper(sip_msg_t *msg, pv_param_t *param, LM_ERR("invalid index\n"); return -1; } + if(idx<0) + { + if((int)nr_branches + idx >= 0) { + idx += nr_branches; + } else { + LM_ERR("index too low: %d (%u)\n", idx, nr_branches); + return -1; + } + } + LM_DBG("managing branch index %d (%u)\n", idx, nr_branches); br = get_sip_branch(idx); }

9 years, 6 months

git:4.3:803321f1: modules/call_control: fixes clang compile warning

by Victor Seva

Module: kamailio Branch: 4.3 Commit: 803321f14153fb0ae87f99771c5d03ec6783dddd URL: https://github.com/kamailio/kamailio/commit/803321f14153fb0ae87f99771c5d03e… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-05T10:15:09+02:00 modules/call_control: fixes clang compile warning - warning: expression which evaluates to zero treated as a null pointer constant of type 'void *' [-Wnon-literal-null-conversion] (cherry picked from commit 18038c2ea3b22cad9099719ecc999266b90e8786) --- Modified: modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/803321f14153fb0ae87f99771c5d03e… Patch: https://github.com/kamailio/kamailio/commit/803321f14153fb0ae87f99771c5d03e… --- diff --git a/modules/call_control/call_control.c b/modules/call_control/call_control.c index 1bd6fcc..45b9b42 100644 --- a/modules/call_control/call_control.c +++ b/modules/call_control/call_control.c @@ -985,7 +985,7 @@ __dialog_ended(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) if( !msg || msg == FAKED_REPLY) msg = _params->req; call_control_stop(msg, dlg->callid); - *_params->param = CCInactive; + *_params->param = (void*)CCInactive; } }

9 years, 6 months

git:4.3:04f86d26: seas: fix gcc warnings:

by Victor Seva

Module: kamailio Branch: 4.3 Commit: 04f86d265a0d26f8dd25bf0ed353ee173b614204 URL: https://github.com/kamailio/kamailio/commit/04f86d265a0d26f8dd25bf0ed353ee1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-05T10:12:40+02:00 seas: fix gcc warnings: statistics.h:76:20: warning: âdestroy_seas_stats_tableâ declared âstaticâ but never defined [-Wunused-function] statistics.h:82:19: warning: âprint_stats_infoâ declared âstaticâ but never defined [-Wunused-function] (cherry picked from commit 6d9abe14cf63e8c4683a8753ad6ae417f6f21ff0) --- Modified: modules/seas/statistics.c Modified: modules/seas/statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/04f86d265a0d26f8dd25bf0ed353ee1… Patch: https://github.com/kamailio/kamailio/commit/04f86d265a0d26f8dd25bf0ed353ee1… --- diff --git a/modules/seas/statistics.c b/modules/seas/statistics.c index 4dcca47..ed62642 100644 --- a/modules/seas/statistics.c +++ b/modules/seas/statistics.c @@ -79,7 +79,7 @@ struct statstable* init_seas_stats_table(void) return seas_stats_table; } -static inline void destroy_seas_stats_table(void) +void destroy_seas_stats_table(void) { /*deallocs the table*/ if(seas_stats_table){ @@ -370,7 +370,7 @@ void serve_stats(int fd) * this limit then the return value is the number of characters (not including the trailing '\\0') which would have been written to the final string * if enough space had been available. Thus, a return value of size or more means that the output was truncated." */ -static inline int print_stats_info(int f,int sock) +int print_stats_info(int f,int sock) { #define STATS_BUF_SIZE 400 int j,k,writen; diff --git a/modules/seas/statistics.h b/modules/seas/statistics.h index 0008a91..cf8e358 100644 --- a/modules/seas/statistics.h +++ b/modules/seas/statistics.h @@ -73,13 +73,13 @@ extern struct statstable *seas_stats_table; */ struct statstable* init_seas_stats_table(void); int stop_stats_server(void); -static inline void destroy_seas_stats_table(void); +void destroy_seas_stats_table(void); /** Statistics server process * functions */ void serve_stats(int fd); int start_stats_server(char *socket); -static inline int print_stats_info(int f,int sock); +int print_stats_info(int f,int sock); /** * Statistics functions */

9 years, 6 months

git:4.3:9371b532: tls: fix gcc warnings:

by Victor Seva

Module: kamailio Branch: 4.3 Commit: 9371b5326bd1b8e01172e184b721d24de9768d0f URL: https://github.com/kamailio/kamailio/commit/9371b5326bd1b8e01172e184b721d24… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-05T10:12:19+02:00 tls: fix gcc warnings: tls_domain.c:507:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:537:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:544:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:576:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:1096:5: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:1104:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:1111:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:222:3: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:565:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:843:5: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:877:5: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:1231:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:1265:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] (cherry picked from commit 7a33987ab4e74266cd0ccecbe14f7196f97a0f05) --- Modified: modules/tls/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/9371b5326bd1b8e01172e184b721d24… Patch: https://github.com/kamailio/kamailio/commit/9371b5326bd1b8e01172e184b721d24… --- diff --git a/modules/tls/tls_util.h b/modules/tls/tls_util.h index efbd842..6fe91a2 100644 --- a/modules/tls/tls_util.h +++ b/modules/tls/tls_util.h @@ -31,26 +31,29 @@ #include "../../str.h" #include "tls_domain.h" +static inline int tls_err_ret(char *s, tls_domains_cfg_t **tls_domains_cfg) { + long err; + int ret = 0; + if ((*tls_domains_cfg)->srv_default->ctx && + (*tls_domains_cfg)->srv_default->ctx[0]) + { + while((err = ERR_get_error())) { + ret = 1; + ERR("%s%s\n", s ? s : "", ERR_error_string(err, 0)); + } + } + return ret; +} -#define TLS_ERR_RET(r, s) \ -do { \ - long err; \ - (r) = 0; \ - if ((*tls_domains_cfg)->srv_default->ctx && \ - (*tls_domains_cfg)->srv_default->ctx[0]) { \ - while((err = ERR_get_error())) { \ - (r) = 1; \ - ERR("%s%s\n", ((s)) ? (s) : "", \ - ERR_error_string(err, 0)); \ - } \ - } \ +#define TLS_ERR_RET(r, s) \ +do { \ + (r) = tls_err_ret((s), tls_domains_cfg); \ } while(0) -#define TLS_ERR(s) \ -do { \ - int ret; \ - TLS_ERR_RET(ret, s); \ +#define TLS_ERR(s) \ +do { \ + tls_err_ret((s), tls_domains_cfg); \ } while(0)

9 years, 6 months

RFC 6141 & CANCEL transaction matching

by Volkan Hatem

Hi All, I searched list archives and have not seen a discussion on this issue. According to 3261, CANCEL transaction matching follows the rules listed in section 17.2.3: [...snip...] 1. the branch parameter in the request is equal to the one in the top Via header field of the request that created the transaction, and 2. the sent-by value in the top Via of the request is equal to the one in the request that created the transaction, and [...snip...] However, according to RFC 6141 (which I don't think kamailio implemented yet) suggests generating a CANCEL request (UAC) after losing contact (section 5.5): [...snip...] When a UAC moves to a new contact and loses its old contact, it will not be able to receive responses to the re-INVITE. Consequently, it will never generate an ACK request. Such a UAC SHOULD generate a CANCEL request to cancel the re-INVITE and cause the INVITE client transaction corresponding to the re-INVITE to enter the "Terminated" state. The UAC SHOULD also send a new re-INVITE in order to make sure that both UAs have a common view of the state of the session. [...snip...] My interpretation is that sent-by comparison is ruled out because clearly IP:PORT will not match anymore. Do you think this is the right interpretation? Is there a plan to implement RFC 6141? Regards, -volkan

9 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015