sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/tcp_tls_changes: io_wait: kqueue: use the entire array during too many errors fallback

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: a9cdfc2938ca73d6ba40f5896c6a8930c2e73f85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9cdfc2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jul 8 15:18:52 2010 +0200 io_wait: kqueue: use the entire array during too many errors fallback Minor fix/optimization: if there are too many errors in the changelist and the kevent() call has to be retried, use the entire array (don't rely on the current watched fd number which will be smaller then the array real size, since commit 996826). (only kqueue using systems are affected by this fix: *bsd and darwin) --- io_wait.h | 105 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 53 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a9c…

14 years, 7 months

git:master: tm: export function to get access to tm table

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 181f81b2458ee04241b36c65ac1d95f38003250d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=181f81b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 8 12:32:45 2010 +0200 tm: export function to get access to tm table - to fix missing symbol in tmx for mode=debug, reported by Santiago Gimeno --- modules/tm/h_table.c | 3 +++ modules/tm/h_table.h | 3 +++ modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 1 + 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 1e61ea6..b07dd31 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -76,6 +76,9 @@ static enum kill_reason kr; lives */ struct s_table* _tm_table; +struct s_table* tm_get_table(void) { + return _tm_table; +} void reset_kr() { kr=0; diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 1c1cd2d..8e43ae3 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -475,6 +475,9 @@ enum kill_reason get_kr(); #define get_tm_table() (_tm_table) +typedef struct s_table* (*tm_get_table_f)(void); +struct s_table* tm_get_table(void); + struct s_table* init_hash_table(); void free_hash_table( ); void free_cell( struct cell* dead_cell ); diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 0b19ad2..a0fad54 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -136,6 +136,7 @@ int load_tm( struct tm_binds *tmb) tmb->unref_cell = unref_cell; tmb->prepare_to_cancel = prepare_to_cancel; tmb->get_stats = tm_get_stats; + tmb->get_table = tm_get_table; #ifdef WITH_TM_CTX tmb->tm_ctx_get = tm_ctx_get; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 2d4b6f6..11cf4e1 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -121,6 +121,7 @@ struct tm_binds { unref_cell_f unref_cell; prepare_to_cancel_f prepare_to_cancel; tm_get_stats_f get_stats; + tm_get_table_f get_table; #ifdef WITH_TM_CTX tm_ctx_get_f tm_ctx_get; #else

14 years, 7 months

git:master: tmx: use TM api function to get tm table

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fb39052ff574c133c74f1f0a1c8d5f43b5bc93be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb39052… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 8 12:34:40 2010 +0200 tmx: use TM api function to get tm table - fix missing symbol for mode=debug, reported by Santiago Gimeno --- modules_k/tmx/t_mi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 54c9ff1..84288df 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -706,7 +706,7 @@ struct mi_root* mi_tm_hash(struct mi_root* cmd_tree, void* param) if (rpl_tree==0) return 0; rpl = &rpl_tree->node; - tm_t = get_tm_table(); + tm_t = _tmx_tmb.get_table(); for (i=0; i<TABLE_ENTRIES; i++) { if(tm_t->entries[i].cur_entries==0

14 years, 7 months

SF.net SVN: openser:[6016] branches/1.5/trie/dtrie.c

by Marius Zbihlei

Revision: 6016 http://openser.svn.sourceforge.net/openser/?rev=6016&view=rev Author: mariuszbihlei Date: 2010-07-07 11:19:19 +0000 (Wed, 07 Jul 2010) Log Message: ----------- Fixed a wrong memory dealocation in the memory leak patch Modified Paths: -------------- branches/1.5/trie/dtrie.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 7 months

git:master: modules/carrierroute Improved pkg memory usage

by Marius Zbihlei

Module: sip-router Branch: master Commit: 922df4f0e32bd953c662c796058c8bf93cfd62b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=922df4f… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Jul 7 13:37:18 2010 +0300 modules/carrierroute Improved pkg memory usage Remove a unnecessary pkg_malloc/pkg_free done for every cr_route() module export. This will decrease pkg memory fragmentation --- modules/carrierroute/cr_func.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index a6da6e2..714a130 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -60,7 +60,7 @@ enum hash_algorithm { static const str SIP_URI = { .s="sip:", .len=4 }; static const str SIPS_URI = { .s="sips:", .len=5 }; static const str AT_SIGN = { .s="@", .len=1 }; - +static char g_rewrite_uri[MAX_URI_SIZE+1]; /** * Get the id that belongs to a string name from gparam_t structure. @@ -289,8 +289,15 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, int_str avp_val; int strip = 0; - str l_user = *user; + str l_user; + + if( !rs || !dest || !msg || !user) { + LM_ERR("NULL parameter\n"); + return -1; + } + l_user = *user; + strip = (rs->strip > user->len ? user->len : rs->strip); strip = (strip < 0 ? 0 : strip); @@ -311,12 +318,12 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, } else { len += SIP_URI.len; } - dest->len = 0; - dest->s = (char *)pkg_malloc(len + 1); - if (dest->s == NULL) { - PKG_MEM_ERROR; + if ( len > MAX_URI_SIZE ) { + LM_ERR("Calculated uri size too large: %d\n", len); return -1; } + + dest->s = g_rewrite_uri; dest->len = len; p = dest->s; if (msg->parsed_uri.type == SIPS_URI_T) { @@ -339,7 +346,6 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, /* this could be an error, or a blacklisted destination */ if (rs->host.len == 0) { *p = '\0'; - pkg_free(dest->s); return -1; } memcpy(p, rs->host.s, rs->host.len); @@ -351,7 +357,6 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, if (add_avp(AVP_VAL_STR | descavp->v.pve->spec.pvp.pvn.u.isname.type, descavp->v.pve->spec.pvp.pvn.u.isname.name, avp_val)<0) { LM_ERR("set AVP failed\n"); - pkg_free(dest->s); return -1; } } @@ -598,7 +603,6 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, if (ret < 0) { LM_ERR("Error in do_action()\n"); } - pkg_free(dest.s); unlock_and_out: release_data(rd);

14 years, 7 months

git:andrei/tcp_tls_changes: tcp: more complete error messages

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: bf755a372f5d5928e275788104204d9c7927c142 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf755a3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 6 23:34:17 2010 +0200 tcp: more complete error messages - more information in some error messages (very useful when debugging) - spelling fixes --- pass_fd.c | 4 ++-- tcp_main.c | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pass_fd.c b/pass_fd.c index dd0f887..26e64f5 100644 --- a/pass_fd.c +++ b/pass_fd.c @@ -205,8 +205,8 @@ again: if (ret<0){ if (errno==EINTR) goto again; if ((errno!=EAGAIN) && (errno!=EWOULDBLOCK)) - LOG(L_CRIT, "ERROR: send_fd: sendmsg failed on %d: %s\n", - unix_socket, strerror(errno)); + LOG(L_CRIT, "ERROR: send_fd: sendmsg failed sending %d on %d:" + " %s (%d)\n", fd, unix_socket, strerror(errno), errno); } return ret; diff --git a/tcp_main.c b/tcp_main.c index 70bbe92..844b3a8 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3542,12 +3542,13 @@ inline static int handle_ser_child(struct process_table* p, int fd_i) switch(cmd){ case CONN_ERROR: LOG(L_ERR, "handle_ser_child: ERROR: received CON_ERROR for %p" - " (id %d), refcnt %d\n", - tcpconn, tcpconn->id, atomic_get(&tcpconn->refcnt)); + " (id %d), refcnt %d, flags 0x%0x\n", + tcpconn, tcpconn->id, atomic_get(&tcpconn->refcnt), + tcpconn->flags); case CONN_EOF: /* forced EOF after full send, due to send flags */ #ifdef TCP_CONNECT_WAIT /* if the connection is pending => it might be on the way of - * reaching tcp_main (e.g. CONN_NEW_COMPLETE or + * reaching tcp_main (e.g. CONN_NEW_COMPLETE or * CONN_NEW_PENDING_WRITE) => it cannot be destroyed here */ if ( !(tcpconn->flags & F_CONN_PENDING) && tcpconn_try_unhash(tcpconn) ) @@ -3855,14 +3856,16 @@ inline static int send2child(struct tcp_connection* tcpconn) return -1; } }else{ - LOG(L_ERR, "ERROR: send2child: send_fd failed\n"); + LOG(L_ERR, "ERROR: send2child: send_fd failed for %p (flags 0x%0x)" + ", fd %d\n", tcpconn, tcpconn->flags, tcpconn->s); return -1; } } #else if (unlikely(send_fd(tcp_children[idx].unix_sock, &tcpconn, sizeof(tcpconn), tcpconn->s)<=0)){ - LOG(L_ERR, "ERROR: send2child: send_fd failed\n"); + LOG(L_ERR, "ERROR: send2child: send_fd failed for %p (flags 0x%0x)" + ", fd %d\n", tcpconn, tcpconn->flags, tcpconn->s); return -1; } #endif @@ -3987,7 +3990,7 @@ static inline int handle_new_connect(struct socket_info* si) * tcp_main is not interested in further io events that might be * queued for this fd) */ -inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, +inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, int fd_i) { #ifdef TCP_ASYNC @@ -4204,7 +4207,7 @@ inline static int handle_io(struct fd_map* fm, short ev, int idx) " idx %d\n", fm, fm->fd, fm->type, fm->data, idx); goto error; default: - LOG(L_CRIT, "BUG: handle_io: uknown fd type %d\n", fm->type); + LOG(L_CRIT, "BUG: handle_io: unknown fd type %d\n", fm->type); goto error; } return ret;

14 years, 7 months

git:andrei/tcp_tls_changes: tcp: fix dispatching closed connections to tcp readers

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: d89437a3d7bc25a9c098a04c6ee69fc3848ff0b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d89437a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 7 11:59:30 2010 +0200 tcp: fix dispatching closed connections to tcp readers Under very heavy load it is possible that send2child() might try to send an already closed connection/fd to a tcp reader. This can happen only if the tcp connection is watched for read (POLLIN) by tcp_main (and not by a tcp reader), the connection becomes available for reading (either new data received, EOF or RST) and tcp_main chooses a specific tcp reader to send the connection to while in the same time the same tcp reader tries to send on the same connection, fails for some reason (no more space for buffering, EOF, RST a.s.o) and sends a close command back to tcp_main. Because send2child() executes first any pending commands from the choosen tcp_reader, this might lead to closing the fd before attempting to send it to the tcp_reader. Under normal circumstances the impact is only an extra syscall and some log messages, however it is possible (but highly unlikely) that after sending the close command the tcp_reader opens a new connection for sending and sends its fd back to tcp_main. This new fd might get the same number as the freshly closed fd and send2child might send the wrong (fd, tcp connection) pair. --- tcp_main.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 844b3a8..aa4fc52 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -2891,6 +2891,7 @@ close_again: su2a(&tcpconn->rcv.src_su, sizeof(tcpconn->rcv.src_su)), fd, tcpconn->flags, strerror(errno), errno); } + tcpconn->s=-1; } @@ -3836,10 +3837,20 @@ inline static int send2child(struct tcp_connection* tcpconn) * send a release command, but the master fills its socket buffer * with new connection commands => deadlock) */ /* answer tcp_send requests first */ - while(handle_ser_child(&pt[tcp_children[idx].proc_no], -1)>0); + while(unlikely((tcpconn->state != S_CONN_BAD) && + (handle_ser_child(&pt[tcp_children[idx].proc_no], -1)>0))); /* process tcp readers requests */ - while(handle_tcp_child(&tcp_children[idx], -1)>0); - + while(unlikely((tcpconn->state != S_CONN_BAD && + (handle_tcp_child(&tcp_children[idx], -1)>0)))); + + /* the above possible pending requests might have included a + command to close this tcpconn (e.g. CONN_ERROR, CONN_EOF). + In this case the fd is already closed here (and possible + even replaced by another one with the same number) so it + must not be sent to a reader anymore */ + if (unlikely(tcpconn->state == S_CONN_BAD || + (tcpconn->flags & F_CONN_FD_CLOSED))) + return -1; #ifdef SEND_FD_QUEUE /* if queue full, try to queue the io */ if (unlikely(send_fd(tcp_children[idx].unix_sock, &tcpconn, @@ -3961,8 +3972,6 @@ static inline int handle_new_connect(struct socket_info* si) DBG("handle_new_connect: new connection from %s: %p %d flags: %04x\n", su2a(&su, sizeof(su)), tcpconn, tcpconn->s, tcpconn->flags); if(unlikely(send2child(tcpconn)<0)){ - LOG(L_ERR,"ERROR: handle_new_connect: no children " - "available\n"); tcpconn->flags&=~F_CONN_READER; tcpconn_put(tcpconn); tcpconn_try_unhash(tcpconn); @@ -4142,7 +4151,6 @@ send_to_child: tcpconn->flags&=~(F_CONN_MAIN_TIMER|F_CONN_READ_W|F_CONN_WANTS_RD); tcpconn_ref(tcpconn); /* refcnt ++ */ if (unlikely(send2child(tcpconn)<0)){ - LOG(L_ERR,"ERROR: handle_tcpconn_ev: no children available\n"); tcpconn->flags&=~F_CONN_READER; #ifdef TCP_ASYNC if (tcpconn->flags & F_CONN_WRITE_W){

14 years, 7 months

git:master: Fixed a memory leak on shm memory, caused by the dtrie implementation.

by Marius Zbihlei

Module: sip-router Branch: master Commit: 5146c47626d0fb9942ae914fc64c11bef728f5f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5146c47… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Jul 7 12:39:58 2010 +0300 Fixed a memory leak on shm memory, caused by the dtrie implementation. dtrie_destroy and dtrie_clear could leak 10 * sizeof(void*) for each node in the trie. Mainly affected carrierroute and userblacklist modules (cherry picked from commit 5c5cc3df5301e86ee78d79f52aa917e0f67f37e8) --- lib/trie/dtrie.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 531340b..9965263 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -88,10 +88,13 @@ void dtrie_delete(struct dtrie_node_t *root, struct dtrie_node_t *node, if (delete_payload) { delete_payload(node->data); } + node->data = NULL; - + if (node != root) { LM_DBG("free node at %p\n", node); + shm_free(node->child); + node->child = NULL; shm_free(node); } } @@ -102,6 +105,7 @@ void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, if ((root!=NULL) && (*root!=NULL)) { dtrie_delete(*root, *root, delete_payload, branches); LM_DBG("free root at %p\n", root); + shm_free((*root)->child); shm_free(*root); *root = NULL; }

14 years, 7 months

git:kamailio_3.0: Fixed a memory leak on shm memory, caused by the dtrie implementation.

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: 5c5cc3df5301e86ee78d79f52aa917e0f67f37e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c5cc3d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Jul 7 12:39:58 2010 +0300 Fixed a memory leak on shm memory, caused by the dtrie implementation. dtrie_destroy and dtrie_clear could leak 10 * sizeof(void*) for each node in the trie. Mainly affected carrierroute and userblacklist modules --- lib/trie/dtrie.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 531340b..9965263 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -88,10 +88,13 @@ void dtrie_delete(struct dtrie_node_t *root, struct dtrie_node_t *node, if (delete_payload) { delete_payload(node->data); } + node->data = NULL; - + if (node != root) { LM_DBG("free node at %p\n", node); + shm_free(node->child); + node->child = NULL; shm_free(node); } } @@ -102,6 +105,7 @@ void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, if ((root!=NULL) && (*root!=NULL)) { dtrie_delete(*root, *root, delete_payload, branches); LM_DBG("free root at %p\n", root); + shm_free((*root)->child); shm_free(*root); *root = NULL; }

14 years, 7 months

SF.net SVN: openser:[6015] branches/1.5/trie/dtrie.c

by Marius Zbihlei

Revision: 6015 http://openser.svn.sourceforge.net/openser/?rev=6015&view=rev Author: mariuszbihlei Date: 2010-07-07 09:31:13 +0000 (Wed, 07 Jul 2010) Log Message: ----------- Fixed a memory leak on pkg memory. dtrie_destroy and dtrie_clear could leak 10 * sizeof(void*) for each node in the trie. Mainly affected carrierroute and userblacklist modules Modified Paths: -------------- branches/1.5/trie/dtrie.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev