sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
247 discussions

git:master: core: Improve tcp stats output
by Hugh Waite 04 Jul '13

04 Jul '13

Module: sip-router Branch: master Commit: fb4dc4b7b866239a90a4d6441ed319664697edab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb4dc4b… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Jul 4 09:33:56 2013 +0100 core: Improve tcp stats output - Add connection ref count - Add websocket protocols --- core_cmd.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index d46c180..304c49d 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -773,8 +773,12 @@ static void core_tcp_list(rpc_t* rpc, void* c) /* tcp data */ if (con->rcv.proto == PROTO_TCP) type = "TCP"; - else if (con->rcv.proto == PROTO_TCP) + else if (con->rcv.proto == PROTO_TLS) type = "TLS"; + else if (con->rcv.proto == PROTO_WSS) + type = "WSS"; + else if (con->rcv.proto == PROTO_WS) + type = "WS"; else type = "UNKNOWN"; @@ -812,11 +816,12 @@ static void core_tcp_list(rpc_t* rpc, void* c) default: state = "UNKNOWN"; } - rpc->struct_add(handle, "dssdsdsd", + rpc->struct_add(handle, "dssddsdsd", "id", con->id, "type", type, "state", state, "timeout", timeout, + "ref_count", con->refcnt, "src_ip", src_ip, "src_port", con->rcv.src_port, "dst_ip", dst_ip,

1 0

git:master: modules/websocket: Fix pkg memory leaks
by Hugh Waite 04 Jul '13

04 Jul '13

Module: sip-router Branch: master Commit: d0f88e19577d9b914922f83049075b7786f3d8df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0f88e1… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Jul 3 10:46:44 2013 +0100 modules/websocket: Fix pkg memory leaks - Fix pkg memory leaks in error cases - Fix incorrect memory allocation size for ws connections - Fix typo in websocket stats --- modules/websocket/ws_conn.c | 4 ++-- modules/websocket/ws_frame.c | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 92e2559..aeda6b2 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -94,7 +94,7 @@ int wsconn_init(void) wsconn_id_hash = (ws_connection_t **) shm_malloc(TCP_ID_HASH_SIZE * - sizeof(ws_connection_t)); + sizeof(ws_connection_t*)); if (wsconn_id_hash == NULL) { LM_ERR("allocating WebSocket hash-table\n"); @@ -395,7 +395,7 @@ static int add_node(struct mi_root *tree, ws_connection_t *wsc) dst_proto = (con->rcv.proto == PROTO_WS) ? "ws" : "wss"; memset(dst_ip, 0, IP6_MAX_STR_SIZE + 1); - ip_addr2sbuf(&con->rcv.dst_ip, src_ip, IP6_MAX_STR_SIZE); + ip_addr2sbuf(&con->rcv.dst_ip, dst_ip, IP6_MAX_STR_SIZE); pong = wsc->awaiting_pong ? "awaiting Pong, " : ""; diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 7b76bac..263f4d2 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -228,6 +228,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) if ((con = tcpconn_get(frame->wsc->id, 0, 0, 0, 0)) == NULL) { LM_WARN("TCP/TLS connection get failed\n"); + pkg_free(send_buf); if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); return -1; @@ -239,6 +240,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) { LM_ERR("removing WebSocket connection\n"); + pkg_free(send_buf); return -1; } } @@ -249,6 +251,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) { STATS_TX_DROPS; LM_WARN("TCP disabled\n"); + pkg_free(send_buf); return -1; } } @@ -259,6 +262,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) { STATS_TX_DROPS; LM_WARN("TLS disabled\n"); + pkg_free(send_buf); return -1; } } @@ -313,15 +317,15 @@ static int close_connection(ws_connection_t *wsc, ws_close_type_t type, char *data; ws_frame_t frame; - data = pkg_malloc(sizeof(char) * (reason.len + 2)); - if (data == NULL) - { - LM_ERR("allocating pkg memory\n"); - return -1; - } - if (wsc->state == WS_S_OPEN) { + data = pkg_malloc(sizeof(char) * (reason.len + 2)); + if (data == NULL) + { + LM_ERR("allocating pkg memory\n"); + return -1; + } + data[0] = (status & 0xff00) >> 8; data[1] = (status & 0x00ff) >> 0; memcpy(&data[2], reason.s, reason.len);

1 0

git:master: modules/tls: Free TLS data for secure websocket connections
by Hugh Waite 04 Jul '13

04 Jul '13

Module: sip-router Branch: master Commit: 074f12c5a444188aa023797ac70e2d38d225cb18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=074f12c… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Jul 3 10:39:32 2013 +0100 modules/tls: Free TLS data for secure websocket connections --- modules/tls/tls_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index e3d0a61..f71956d 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -564,7 +564,7 @@ void tls_h_tcpconn_clean(struct tcp_connection *c) /* * runs within global tcp lock */ - if (c->type != PROTO_TLS) { + if ((c->type != PROTO_TLS) && (c->type != PROTO_WSS)) { BUG("Bad connection structure\n"); abort(); }

1 0

git:4.0: uac_redirect: adapted previous backport to append_branch() prototype for v4.0
by Daniel-Constantin Mierla 03 Jul '13

03 Jul '13

Module: sip-router Branch: 4.0 Commit: d8c3a23ad2a5c925b16d75f33fcb865f09d7f308 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8c3a23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 3 23:29:29 2013 +0200 uac_redirect: adapted previous backport to append_branch() prototype for v4.0 --- modules/uac_redirect/rd_funcs.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/uac_redirect/rd_funcs.c b/modules/uac_redirect/rd_funcs.c index 89917f7..69e6f31 100644 --- a/modules/uac_redirect/rd_funcs.c +++ b/modules/uac_redirect/rd_funcs.c @@ -290,8 +290,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, scontacts[i]->uri.s); if(sruid_next(&_redirect_sruid)==0) { if(append_branch( 0, &scontacts[i]->uri, 0, 0, sqvalues[i], - bflags, 0, &_redirect_sruid.uid, 0, - &_redirect_sruid.uid, &_redirect_sruid.uid)<0) { + bflags, 0, &_redirect_sruid.uid, 0)<0) { LM_ERR("failed to add contact to dset\n"); } else { added++;

1 0

git:4.0: uac_redirect: fetch all contact headers in redirect replies
by Daniel-Constantin Mierla 03 Jul '13

03 Jul '13

Module: sip-router Branch: 4.0 Commit: 0227f5b61e1ea03e92a7fec9b177f602481fac84 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0227f5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 3 23:23:40 2013 +0200 uac_redirect: fetch all contact headers in redirect replies - only first header was considered for redirect handling - based on a report by Geoffrey Mina - generate fake ruid (used as instance and user-agent) to satisfy the requirements of t_load_contacts()/t_next_contacts() (cherry picked from commit c5081ad634742d88e56e4fcc097b756098119e4e) --- modules/uac_redirect/Makefile | 2 + modules/uac_redirect/rd_funcs.c | 137 ++++++++++++++++++++++----------------- modules/uac_redirect/redirect.c | 15 ++++- 3 files changed, 94 insertions(+), 60 deletions(-) diff --git a/modules/uac_redirect/Makefile b/modules/uac_redirect/Makefile index d8c2ae1..0b7e22d 100644 --- a/modules/uac_redirect/Makefile +++ b/modules/uac_redirect/Makefile @@ -10,4 +10,6 @@ LIBS= DEFS+=-DKAMAILIO_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srutils/srutils include ../../Makefile.modules diff --git a/modules/uac_redirect/rd_funcs.c b/modules/uac_redirect/rd_funcs.c index 2f85ed1..89917f7 100644 --- a/modules/uac_redirect/rd_funcs.c +++ b/modules/uac_redirect/rd_funcs.c @@ -32,11 +32,14 @@ #include "../../dprint.h" #include "../../qvalue.h" #include "../../parser/contact/parse_contact.h" +#include "../../lib/srutils/sruid.h" #include "../../qvalue.h" #include "rd_filter.h" #include "rd_funcs.h" +extern sruid_t _redirect_sruid; + #define MAX_CONTACTS_PER_REPLY 16 #define DEFAULT_Q_VALUE 10 @@ -115,7 +118,7 @@ error: /* returns the number of contacts put in the sorted array */ -static int sort_contacts(contact_t *ct_list, contact_t **ct_array, +static int sort_contacts(hdr_field_t *chdr, contact_t **ct_array, qvalue_t *q_array) { param_t *q_para; @@ -123,48 +126,54 @@ static int sort_contacts(contact_t *ct_list, contact_t **ct_array, int n; int i,j; char backup; + contact_t *ct_list; + hdr_field_t *hdr; n = 0; /* number of sorted contacts */ - for( ; ct_list ; ct_list = ct_list->next ) { - /* check the filters first */ - backup = ct_list->uri.s[ct_list->uri.len]; - ct_list->uri.s[ct_list->uri.len] = 0; - if ( run_filters( ct_list->uri.s )==-1 ){ - ct_list->uri.s[ct_list->uri.len] = backup; - continue; - } - ct_list->uri.s[ct_list->uri.len] = backup; - /* does the contact has a q val? */ - q_para = ct_list->q; - if (q_para==0 || q_para->body.len==0) { - q = DEFAULT_Q_VALUE; - } else { - if (str2q( &q, q_para->body.s, q_para->body.len)!=0) { - LM_ERR("invalid q param\n"); - /* skip this contact */ + for(hdr=chdr; hdr; hdr=hdr->next) { + if(hdr->type != HDR_CONTACT_T) continue; + ct_list = ((contact_body_t*)hdr->parsed)->contacts; + for( ; ct_list ; ct_list = ct_list->next ) { + /* check the filters first */ + backup = ct_list->uri.s[ct_list->uri.len]; + ct_list->uri.s[ct_list->uri.len] = 0; + if ( run_filters( ct_list->uri.s )==-1 ){ + ct_list->uri.s[ct_list->uri.len] = backup; continue; } - } - LM_DBG("sort_contacts: <%.*s> q=%d\n", - ct_list->uri.len,ct_list->uri.s,q); - /*insert the contact into the sorted array */ - for(i=0;i<n;i++) { - /* keep in mind that the contact list is reversts */ - if (q_array[i]<=q) - continue; - break; - } - if (i!=MAX_CONTACTS_PER_REPLY) { - /* insert the contact at this position */ - for( j=n-1-1*(n==MAX_CONTACTS_PER_REPLY) ; j>=i ; j-- ) { - ct_array[j+1] = ct_array[j]; - q_array[j+1] = q_array[j]; + ct_list->uri.s[ct_list->uri.len] = backup; + /* does the contact has a q val? */ + q_para = ct_list->q; + if (q_para==0 || q_para->body.len==0) { + q = DEFAULT_Q_VALUE; + } else { + if (str2q( &q, q_para->body.s, q_para->body.len)!=0) { + LM_ERR("invalid q param\n"); + /* skip this contact */ + continue; + } + } + LM_DBG("sort_contacts: <%.*s> q=%d\n", + ct_list->uri.len,ct_list->uri.s,q); + /*insert the contact into the sorted array */ + for(i=0;i<n;i++) { + /* keep in mind that the contact list is reversts */ + if (q_array[i]<=q) + continue; + break; + } + if (i!=MAX_CONTACTS_PER_REPLY) { + /* insert the contact at this position */ + for( j=n-1-1*(n==MAX_CONTACTS_PER_REPLY) ; j>=i ; j-- ) { + ct_array[j+1] = ct_array[j]; + q_array[j+1] = q_array[j]; + } + ct_array[j+1] = ct_list; + q_array[j+1] = q; + if (n!=MAX_CONTACTS_PER_REPLY) + n++; } - ct_array[j+1] = ct_list; - q_array[j+1] = q; - if (n!=MAX_CONTACTS_PER_REPLY) - n++; } } return n; @@ -211,7 +220,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, memcpy( &dup_rpl, sh_rpl, sizeof(struct sip_msg) ); dup = 2; /* ok -> force the parsing of contact header */ - if ( parse_headers( &dup_rpl, HDR_CONTACT_F, 0)<0 ) { + if ( parse_headers( &dup_rpl, HDR_EOH_F, 0)<0 ) { LM_ERR("dup_rpl parse failed\n"); ret = -1; goto restore; @@ -224,7 +233,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, } else { dup = 3; /* force the parsing of contact header */ - if ( parse_headers( sh_rpl, HDR_CONTACT_F, 0)<0 ) { + if ( parse_headers( sh_rpl, HDR_EOH_F, 0)<0 ) { LM_ERR("sh_rpl parse failed\n"); ret = -1; goto restore; @@ -239,18 +248,23 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, contact_hdr = sh_rpl->contact; } - /* parse the body of contact header */ - if (contact_hdr->parsed==0) { - if ( parse_contact(contact_hdr)<0 ) { - LM_ERR("contact hdr parse failed\n"); - ret = -1; - goto restore; + /* parse the body of contact headers */ + hdr = contact_hdr; + while(hdr) { + if (hdr->type == HDR_CONTACT_T) { + if (hdr->parsed==0) { + if(parse_contact(hdr) < 0) { + LM_ERR("failed to parse Contact body\n"); + ret = -1; + goto restore; + } + if (dup==0) + dup = 1; + } } - if (dup==0) - dup = 1; + hdr = hdr->next; } - /* we have the contact header and its body parsed -> sort the contacts * based on the q value */ contacts = ((contact_body_t*)contact_hdr->parsed)->contacts; @@ -258,7 +272,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, LM_DBG("contact hdr has no contacts\n"); goto restore; } - n = sort_contacts( contacts, scontacts, sqvalues); + n = sort_contacts(contact_hdr, scontacts, sqvalues); if (n==0) { LM_DBG("no contacts left after filtering\n"); goto restore; @@ -274,17 +288,22 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, for ( i=0 ; i<n ; i++ ) { LM_DBG("adding contact <%.*s>\n", scontacts[i]->uri.len, scontacts[i]->uri.s); - if (km_append_branch( 0, &scontacts[i]->uri, 0, 0, sqvalues[i], - bflags, 0)<0) { - LM_ERR("failed to add contact to dset\n"); - } else { - added++; - if (rd_acc_fct!=0 && reason) { - /* log the redirect */ - req->new_uri = scontacts[i]->uri; - //FIXME - rd_acc_fct( req, (char*)reason, acc_db_table); + if(sruid_next(&_redirect_sruid)==0) { + if(append_branch( 0, &scontacts[i]->uri, 0, 0, sqvalues[i], + bflags, 0, &_redirect_sruid.uid, 0, + &_redirect_sruid.uid, &_redirect_sruid.uid)<0) { + LM_ERR("failed to add contact to dset\n"); + } else { + added++; + if (rd_acc_fct!=0 && reason) { + /* log the redirect */ + req->new_uri = scontacts[i]->uri; + //FIXME + rd_acc_fct( req, (char*)reason, acc_db_table); + } } + } else { + LM_ERR("failed to generate ruid for a new branch\n"); } } diff --git a/modules/uac_redirect/redirect.c b/modules/uac_redirect/redirect.c index febd373..b4e55d1 100644 --- a/modules/uac_redirect/redirect.c +++ b/modules/uac_redirect/redirect.c @@ -32,6 +32,7 @@ #include "../../str.h" #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../lib/srutils/sruid.h" #include "../../modules/tm/tm_load.h" #include "rd_funcs.h" #include "rd_filter.h" @@ -56,9 +57,12 @@ unsigned int bflags = 0; #define ACCEPT_RULE_STR "accept" #define DENY_RULE_STR "deny" +/* sruid to get internal uid */ +sruid_t _redirect_sruid; static int redirect_init(void); +static int child_init(int rank); static int w_set_deny(struct sip_msg* msg, char *dir, char *foo); static int w_set_accept(struct sip_msg* msg, char *dir, char *foo); static int w_get_redirect1(struct sip_msg* msg, char *dir, char *foo); @@ -103,7 +107,7 @@ struct module_exports exports = { redirect_init, /* Module initialization function */ 0, 0, - (child_init_function) 0 /* per-child init function */ + child_init /* per-child init function */ }; @@ -295,11 +299,20 @@ static int redirect_init(void) } add_default_filter( DENY_FILTER, filter); + if(sruid_init(&_redirect_sruid, '-', "rdir", SRUID_INC)<0) + return -1; + return 0; error: return -1; } +static int child_init(int rank) +{ + if(sruid_init(&_redirect_sruid, '-', "rdir", SRUID_INC)<0) + return -1; + return 0; +} static inline void msg_tracer(struct sip_msg* msg, int reset) {

1 0

git:master: uac_redirect: fetch all contact headers in redirect replies
by Daniel-Constantin Mierla 03 Jul '13

03 Jul '13

Module: sip-router Branch: master Commit: c5081ad634742d88e56e4fcc097b756098119e4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5081ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 3 23:23:40 2013 +0200 uac_redirect: fetch all contact headers in redirect replies - only first header was considered for redirect handling - based on a report by Geoffrey Mina - generate fake ruid (used as instance and user-agent) to satisfy the requirements of t_load_contacts()/t_next_contacts() --- modules/uac_redirect/Makefile | 2 + modules/uac_redirect/rd_funcs.c | 137 ++++++++++++++++++++++----------------- modules/uac_redirect/redirect.c | 15 ++++- 3 files changed, 94 insertions(+), 60 deletions(-) diff --git a/modules/uac_redirect/Makefile b/modules/uac_redirect/Makefile index d8c2ae1..0b7e22d 100644 --- a/modules/uac_redirect/Makefile +++ b/modules/uac_redirect/Makefile @@ -10,4 +10,6 @@ LIBS= DEFS+=-DKAMAILIO_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srutils/srutils include ../../Makefile.modules diff --git a/modules/uac_redirect/rd_funcs.c b/modules/uac_redirect/rd_funcs.c index 2f85ed1..89917f7 100644 --- a/modules/uac_redirect/rd_funcs.c +++ b/modules/uac_redirect/rd_funcs.c @@ -32,11 +32,14 @@ #include "../../dprint.h" #include "../../qvalue.h" #include "../../parser/contact/parse_contact.h" +#include "../../lib/srutils/sruid.h" #include "../../qvalue.h" #include "rd_filter.h" #include "rd_funcs.h" +extern sruid_t _redirect_sruid; + #define MAX_CONTACTS_PER_REPLY 16 #define DEFAULT_Q_VALUE 10 @@ -115,7 +118,7 @@ error: /* returns the number of contacts put in the sorted array */ -static int sort_contacts(contact_t *ct_list, contact_t **ct_array, +static int sort_contacts(hdr_field_t *chdr, contact_t **ct_array, qvalue_t *q_array) { param_t *q_para; @@ -123,48 +126,54 @@ static int sort_contacts(contact_t *ct_list, contact_t **ct_array, int n; int i,j; char backup; + contact_t *ct_list; + hdr_field_t *hdr; n = 0; /* number of sorted contacts */ - for( ; ct_list ; ct_list = ct_list->next ) { - /* check the filters first */ - backup = ct_list->uri.s[ct_list->uri.len]; - ct_list->uri.s[ct_list->uri.len] = 0; - if ( run_filters( ct_list->uri.s )==-1 ){ - ct_list->uri.s[ct_list->uri.len] = backup; - continue; - } - ct_list->uri.s[ct_list->uri.len] = backup; - /* does the contact has a q val? */ - q_para = ct_list->q; - if (q_para==0 || q_para->body.len==0) { - q = DEFAULT_Q_VALUE; - } else { - if (str2q( &q, q_para->body.s, q_para->body.len)!=0) { - LM_ERR("invalid q param\n"); - /* skip this contact */ + for(hdr=chdr; hdr; hdr=hdr->next) { + if(hdr->type != HDR_CONTACT_T) continue; + ct_list = ((contact_body_t*)hdr->parsed)->contacts; + for( ; ct_list ; ct_list = ct_list->next ) { + /* check the filters first */ + backup = ct_list->uri.s[ct_list->uri.len]; + ct_list->uri.s[ct_list->uri.len] = 0; + if ( run_filters( ct_list->uri.s )==-1 ){ + ct_list->uri.s[ct_list->uri.len] = backup; continue; } - } - LM_DBG("sort_contacts: <%.*s> q=%d\n", - ct_list->uri.len,ct_list->uri.s,q); - /*insert the contact into the sorted array */ - for(i=0;i<n;i++) { - /* keep in mind that the contact list is reversts */ - if (q_array[i]<=q) - continue; - break; - } - if (i!=MAX_CONTACTS_PER_REPLY) { - /* insert the contact at this position */ - for( j=n-1-1*(n==MAX_CONTACTS_PER_REPLY) ; j>=i ; j-- ) { - ct_array[j+1] = ct_array[j]; - q_array[j+1] = q_array[j]; + ct_list->uri.s[ct_list->uri.len] = backup; + /* does the contact has a q val? */ + q_para = ct_list->q; + if (q_para==0 || q_para->body.len==0) { + q = DEFAULT_Q_VALUE; + } else { + if (str2q( &q, q_para->body.s, q_para->body.len)!=0) { + LM_ERR("invalid q param\n"); + /* skip this contact */ + continue; + } + } + LM_DBG("sort_contacts: <%.*s> q=%d\n", + ct_list->uri.len,ct_list->uri.s,q); + /*insert the contact into the sorted array */ + for(i=0;i<n;i++) { + /* keep in mind that the contact list is reversts */ + if (q_array[i]<=q) + continue; + break; + } + if (i!=MAX_CONTACTS_PER_REPLY) { + /* insert the contact at this position */ + for( j=n-1-1*(n==MAX_CONTACTS_PER_REPLY) ; j>=i ; j-- ) { + ct_array[j+1] = ct_array[j]; + q_array[j+1] = q_array[j]; + } + ct_array[j+1] = ct_list; + q_array[j+1] = q; + if (n!=MAX_CONTACTS_PER_REPLY) + n++; } - ct_array[j+1] = ct_list; - q_array[j+1] = q; - if (n!=MAX_CONTACTS_PER_REPLY) - n++; } } return n; @@ -211,7 +220,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, memcpy( &dup_rpl, sh_rpl, sizeof(struct sip_msg) ); dup = 2; /* ok -> force the parsing of contact header */ - if ( parse_headers( &dup_rpl, HDR_CONTACT_F, 0)<0 ) { + if ( parse_headers( &dup_rpl, HDR_EOH_F, 0)<0 ) { LM_ERR("dup_rpl parse failed\n"); ret = -1; goto restore; @@ -224,7 +233,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, } else { dup = 3; /* force the parsing of contact header */ - if ( parse_headers( sh_rpl, HDR_CONTACT_F, 0)<0 ) { + if ( parse_headers( sh_rpl, HDR_EOH_F, 0)<0 ) { LM_ERR("sh_rpl parse failed\n"); ret = -1; goto restore; @@ -239,18 +248,23 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, contact_hdr = sh_rpl->contact; } - /* parse the body of contact header */ - if (contact_hdr->parsed==0) { - if ( parse_contact(contact_hdr)<0 ) { - LM_ERR("contact hdr parse failed\n"); - ret = -1; - goto restore; + /* parse the body of contact headers */ + hdr = contact_hdr; + while(hdr) { + if (hdr->type == HDR_CONTACT_T) { + if (hdr->parsed==0) { + if(parse_contact(hdr) < 0) { + LM_ERR("failed to parse Contact body\n"); + ret = -1; + goto restore; + } + if (dup==0) + dup = 1; + } } - if (dup==0) - dup = 1; + hdr = hdr->next; } - /* we have the contact header and its body parsed -> sort the contacts * based on the q value */ contacts = ((contact_body_t*)contact_hdr->parsed)->contacts; @@ -258,7 +272,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, LM_DBG("contact hdr has no contacts\n"); goto restore; } - n = sort_contacts( contacts, scontacts, sqvalues); + n = sort_contacts(contact_hdr, scontacts, sqvalues); if (n==0) { LM_DBG("no contacts left after filtering\n"); goto restore; @@ -274,17 +288,22 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, for ( i=0 ; i<n ; i++ ) { LM_DBG("adding contact <%.*s>\n", scontacts[i]->uri.len, scontacts[i]->uri.s); - if (km_append_branch( 0, &scontacts[i]->uri, 0, 0, sqvalues[i], - bflags, 0)<0) { - LM_ERR("failed to add contact to dset\n"); - } else { - added++; - if (rd_acc_fct!=0 && reason) { - /* log the redirect */ - req->new_uri = scontacts[i]->uri; - //FIXME - rd_acc_fct( req, (char*)reason, acc_db_table); + if(sruid_next(&_redirect_sruid)==0) { + if(append_branch( 0, &scontacts[i]->uri, 0, 0, sqvalues[i], + bflags, 0, &_redirect_sruid.uid, 0, + &_redirect_sruid.uid, &_redirect_sruid.uid)<0) { + LM_ERR("failed to add contact to dset\n"); + } else { + added++; + if (rd_acc_fct!=0 && reason) { + /* log the redirect */ + req->new_uri = scontacts[i]->uri; + //FIXME + rd_acc_fct( req, (char*)reason, acc_db_table); + } } + } else { + LM_ERR("failed to generate ruid for a new branch\n"); } } diff --git a/modules/uac_redirect/redirect.c b/modules/uac_redirect/redirect.c index febd373..b4e55d1 100644 --- a/modules/uac_redirect/redirect.c +++ b/modules/uac_redirect/redirect.c @@ -32,6 +32,7 @@ #include "../../str.h" #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../lib/srutils/sruid.h" #include "../../modules/tm/tm_load.h" #include "rd_funcs.h" #include "rd_filter.h" @@ -56,9 +57,12 @@ unsigned int bflags = 0; #define ACCEPT_RULE_STR "accept" #define DENY_RULE_STR "deny" +/* sruid to get internal uid */ +sruid_t _redirect_sruid; static int redirect_init(void); +static int child_init(int rank); static int w_set_deny(struct sip_msg* msg, char *dir, char *foo); static int w_set_accept(struct sip_msg* msg, char *dir, char *foo); static int w_get_redirect1(struct sip_msg* msg, char *dir, char *foo); @@ -103,7 +107,7 @@ struct module_exports exports = { redirect_init, /* Module initialization function */ 0, 0, - (child_init_function) 0 /* per-child init function */ + child_init /* per-child init function */ }; @@ -295,11 +299,20 @@ static int redirect_init(void) } add_default_filter( DENY_FILTER, filter); + if(sruid_init(&_redirect_sruid, '-', "rdir", SRUID_INC)<0) + return -1; + return 0; error: return -1; } +static int child_init(int rank) +{ + if(sruid_init(&_redirect_sruid, '-', "rdir", SRUID_INC)<0) + return -1; + return 0; +} static inline void msg_tracer(struct sip_msg* msg, int reset) {

1 0

git:master: dialog: detect if no trasaction is created after config execution for new dialogs
by Daniel-Constantin Mierla 02 Jul '13

02 Jul '13

Module: sip-router Branch: master Commit: fa0339b1906690f009786fc9ed92c73a8c9e6520 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa0339b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 2 23:32:37 2013 +0200 dialog: detect if no trasaction is created after config execution for new dialogs - release the dialog to avoid endless storage in state 1 --- modules/dialog/dlg_handlers.c | 10 +++++++++- modules/dialog/dlg_var.c | 14 +++++++++++++- modules/dialog/dlg_var.h | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index ec55a13..9393d7f 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -721,11 +721,14 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) if (dlg==NULL) { if((req->flags&dlg_flag)!=dlg_flag) return; + LM_DBG("dialog creation on config flag\n"); dlg_new_dialog(req, t, 1); dlg = dlg_get_ctx_dialog(); } if (dlg!=NULL) { + LM_DBG("dialog added to tm callbacks\n"); dlg_set_tm_callbacks(t, req, dlg, spiral_detected); + _dlg_ctx.t = 1; dlg_release(dlg); } } @@ -1515,8 +1518,13 @@ int dlg_manage(sip_msg_t *msg) dlg = dlg_get_ctx_dialog(); if(dlg==NULL) return -1; - if(t!=NULL) + if(t!=NULL) { dlg_set_tm_callbacks(t, msg, dlg, spiral_detected); + _dlg_ctx.t = 1; + LM_DBG("dialog created on existing transaction\n"); + } else { + LM_DBG("dialog created before transaction\n"); + } dlg_release(dlg); } return 1; diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index 108af0f..0d8a1c7 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -22,6 +22,7 @@ */ #include "../../route.h" +#include "../../script_cb.h" #include "../../pvapi.h" #include "dlg_var.h" @@ -38,8 +39,19 @@ struct dlg_var * var_table = 0; /*! ID of the current message */ int msg_id; -int dlg_cfg_cb(struct sip_msg *foo, unsigned int flags, void *bar) +int dlg_cfg_cb(sip_msg_t *msg, unsigned int flags, void *cbp) { + dlg_cell_t *dlg; + if(flags&POST_SCRIPT_CB) { + dlg = dlg_get_ctx_dialog(); + if(dlg!=NULL) { + if(_dlg_ctx.t==0 && dlg->state==DLG_STATE_UNCONFIRMED) { + LM_DBG("new dialog with no trasaction after config execution\n"); + dlg_release(dlg); + } + dlg_release(dlg); + } + } memset(&_dlg_ctx, 0, sizeof(dlg_ctx_t)); return 1; diff --git a/modules/dialog/dlg_var.h b/modules/dialog/dlg_var.h index 9648ab2..ec2c9c7 100644 --- a/modules/dialog/dlg_var.h +++ b/modules/dialog/dlg_var.h @@ -41,6 +41,7 @@ typedef struct _dlg_ctx { dlg_iuid_t iuid; int set; unsigned int dir; + int t; } dlg_ctx_t; /* A dialog-variable */

1 0

git:master: kamailio-basic.cfg: added basic cfg config file
by Daniel-Constantin Mierla 02 Jul '13

02 Jul '13

Module: sip-router Branch: master Commit: b4682cac2e2f151288a411018da077b6d1526eca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4682ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 2 21:40:32 2013 +0200 kamailio-basic.cfg: added basic cfg config file - get the same set of configs as expected by former ser flavour --- etc/kamailio-basic.cfg | 612 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 612 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b46…

1 0

the new memcache module
by Dragos Oancea 02 Jul '13

02 Jul '13

Hi Henning & Charles, So far the module performed pretty good for us. But there might be a problem, when I shut down Kamailio I see this in the logs : ERROR: memcached [memcached.c:255]: mod_destroy(): memory manager callbacks not removed, returned INVALID ARGUMENTS but continue anyway It also dumps core at shutdown: http://pastebin.com/5uJJ3tp4 Regards, Dragos ________________________________ From: Henning Westerholt <hw(a)kamailio.org> To: sr-users(a)lists.sip-router.org Cc: Charles Chance <charles.chance(a)sipcentric.com>; Dragos Oancea <droancea(a)yahoo.com> Sent: Friday, June 14, 2013 6:24 PM Subject: Re: [SR-Users] memcache problem - reporting protocol error Am Freitag, 7. Juni 2013, 12:07:00 schrieb Charles Chance: > Yes, that should work fine. > > Cheers, Hello Dragos, just one thing to add - if you find any issues with the master version of the module, please report to our developer list that we could take a look. Best regards, Henning Westerholt

3 6

git:master: memcached: fix crash during shutdown, make used memory manager configurable
by Henning Westerholt 02 Jul '13

02 Jul '13

Module: sip-router Branch: master Commit: df41d7f4e0cd8bd0c328f94360a6b3a3f3e9d59b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df41d7f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Sun Jun 30 15:42:17 2013 +0200 memcached: fix crash during shutdown, make used memory manager configurable * fix a crash during shutwdown, as reported from Dragos Oancea, droancea at yahoo dot com * make memcache client library memory manager configurable, as default use the one from the system as this is probably the most tested configuration in the field * the internal memory manager should provide a better performance in this case, but as the old library has some issues with the internal one, we better stay with this * documentation will be provided in the next commit --- modules/memcached/memcached.c | 45 ++++++++++++++++++++--------------------- modules/memcached/memcached.h | 4 ++- test/unit/45.cfg | 1 + 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/modules/memcached/memcached.c b/modules/memcached/memcached.c index 32852d9..86a08b3 100644 --- a/modules/memcached/memcached.c +++ b/modules/memcached/memcached.c @@ -43,7 +43,9 @@ unsigned int mcd_expire = 0; /*! cache storage mode, set or add */ unsigned int mcd_mode = 0; /*! server timeout in ms*/ -int mcd_timeout = 5000; +unsigned int mcd_timeout = 5000; +/*! Internal or system memory manager, default is system */ +unsigned int mcd_memory = 0; /*! memcached handle */ struct memcached_st *memcached_h; /*! memcached server list */ @@ -76,9 +78,10 @@ static pv_export_t mod_pvs[] = { */ static param_export_t params[] = { {"servers", STR_PARAM, &mcd_srv_str }, - {"expire", INT_PARAM, &mcd_expire }, + {"expire", INT_PARAM, &mcd_expire }, {"timeout", INT_PARAM, &mcd_timeout }, {"mode", INT_PARAM, &mcd_mode }, + {"memory", INT_PARAM, &mcd_memory }, {0, 0, 0} }; @@ -105,10 +108,12 @@ struct module_exports exports = { /*! * \brief Wrapper functions around our internal memory management * \param mem freed memory + * \note pkg_free does not allow NULL pointer as standard free, therefore we check it here * \see pkg_free */ static inline void mcd_free(memcached_st *ptr, void *mem, void *context) { - pkg_free(mem); + if (mem) + pkg_free(mem); } @@ -201,17 +206,21 @@ static int mod_init(void) { } LM_DBG("allocated new server handle at %p", memcached_h); - LM_DBG("set memory manager callbacks"); - rc = memcached_set_memory_allocators(memcached_h, (memcached_malloc_fn)mcd_malloc, + if (mcd_memory == 1) { + LM_INFO("Use internal kamailio memory manager for memcached client library"); + rc = memcached_set_memory_allocators(memcached_h, (memcached_malloc_fn)mcd_malloc, (memcached_free_fn)mcd_free, (memcached_realloc_fn)mcd_realloc, (memcached_calloc_fn)mcd_calloc, NULL); - if (rc == MEMCACHED_SUCCESS) { - LM_DBG("memory manager callbacks set"); + if (rc == MEMCACHED_SUCCESS) { + LM_DBG("memory manager callbacks set"); + } else { + LM_ERR("memory manager callbacks not set, returned %s.\n", memcached_strerror(memcached_h, rc)); + return -1; + } } else { - LM_ERR("memory manager callbacks not set, returned %s.\n", memcached_strerror(memcached_h, rc)); - return -1; + LM_INFO("Use system memory manager for memcached client library"); } - + servers = memcached_server_list_append(servers, server, atoi(port), &rc); if (memcached_behavior_set(memcached_h, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, mcd_timeout) != MEMCACHED_SUCCESS) { @@ -241,20 +250,10 @@ static int mod_init(void) { * \brief Module shutdown function */ static void mod_destroy(void) { - memcached_return rc; - if (servers != NULL) memcached_server_list_free(servers); - /* unset custom memory manager to enable clean shutdown of in system memory allocated server structure */ - LM_DBG("remove memory manager callbacks"); - rc = memcached_set_memory_allocators(memcached_h, NULL, NULL, NULL, NULL, NULL); - if (rc == MEMCACHED_SUCCESS) { - LM_DBG("memory manager callbacks removed"); - } else { - LM_ERR("memory manager callbacks not removed, returned %s but continue anyway.\n", memcached_strerror(memcached_h, rc)); - } - - if (memcached_h != NULL) - memcached_free(memcached_h); + /* Crash on shutdown with internal memory manager, even if we disable the mm callbacks */ + if (mcd_memory != 1 && memcached_h != NULL) + memcached_free(memcached_h); } diff --git a/modules/memcached/memcached.h b/modules/memcached/memcached.h index 4d9a875..407d39f 100644 --- a/modules/memcached/memcached.h +++ b/modules/memcached/memcached.h @@ -35,7 +35,9 @@ extern unsigned int mcd_expire; /*! cache storage mode, set or add */ extern unsigned int mcd_mode; /*! server timeout */ -extern int mcd_timeout; +extern unsigned int mcd_timeout; +/*! Internal or system memory manager */ +extern unsigned int mcd_memory; /*! memcached handle */ extern struct memcached_st* memcached_h; /*! memcached server list */ diff --git a/test/unit/45.cfg b/test/unit/45.cfg index f2b8c93..a170672 100644 --- a/test/unit/45.cfg +++ b/test/unit/45.cfg @@ -29,6 +29,7 @@ loadmodule "xlog/xlog.so" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") modparam("usrloc", "db_mode", 3) modparam("usrloc", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") +modparam("memcached", "memory", 0) #-----------------------Routing configuration---------------------------------# route{

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2013