sr-dev May 2011

sr-dev@lists.kamailio.org

28 participants
166 discussions

[tracker] Assignee added: kamailio debian build error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#130 - kamailio debian build error User who did this - Marcus Hunger (fnordian) http://sip-router.org/tracker/index.php?do=details&task_id=130 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 7 months

Problem with Presence Server when a contat is deleted from a contact list

by laura testi

Hello, I’m asking your help because I’m facing with the following issue: 1. The user A deletes the contact B from its own contact list; 2. The client sends a XCAP PUT event in order to update the user A resource- list (removing the contact B) and to remove the watcher A from the user B presence-rules; 3. Then the Presence Server, instead of remove the record “A watcher of B presentity-uri” in the watcher table, changes the status value of this record from Active (1) to Pending (2). So that , correctly, the “pending record” generates a Notify event against the user B: the authorization pop-up is shown to the user B as if A had added contact B. The expected behavior should see the Presence Server removing the record “A watcher and B presentity-uri” from the watcher table or set the status in a “terminated” status. Could you please tell me how to solve this issue? It’s a known bug? About the env: Kamailio server v. 3.1.3 as registrar and presence server and Jitsi Sip Communicator as SIP Client. Thanks a lot and kind Regards. laura

13 years, 7 months

git:3.1: tcp: fix send2child() error case

by Andrei Pelinescu-Onciul

Module: sip-router Branch: 3.1 Commit: 1e14827ab627db52eae556a027838cc64d3a57cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e14827… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 5 00:43:48 2011 +0200 tcp: fix send2child() error case If send2child() fails don't decrement the refcnt if the connection was already removed from the hash due to some other previous error (very unlikely, but possible). (cherry picked from commit a8859f52b9dab4b3a79babe19f3d30c3dfcb95ce) --- tcp_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 028fdfb..ac76dc5 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -4036,8 +4036,8 @@ static inline int handle_new_connect(struct socket_info* si) su2a(&su, sizeof(su)), tcpconn, tcpconn->s, tcpconn->flags); if(unlikely(send2child(tcpconn)<0)){ tcpconn->flags&=~F_CONN_READER; - tcpconn_put(tcpconn); - tcpconn_try_unhash(tcpconn); + if (tcpconn_try_unhash(tcpconn)) + tcpconn_put(tcpconn); tcpconn_put_destroy(tcpconn); } #endif @@ -4226,8 +4226,8 @@ send_to_child: tcpconn->flags&=~F_CONN_WRITE_W; } #endif /* TCP_ASYNC */ - tcpconn_put(tcpconn); - tcpconn_try_unhash(tcpconn); + if (tcpconn_try_unhash(tcpconn)) + tcpconn_put(tcpconn); tcpconn_put_destroy(tcpconn); /* because of the tcpconn_ref() */ } }

13 years, 7 months

git:3.1: tcp: fix tcp_*_destroy() bug case

by Andrei Pelinescu-Onciul

Module: sip-router Branch: 3.1 Commit: 463053fcd129b80b2370145b36d69638c65f7e63 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=463053f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 5 00:35:31 2011 +0200 tcp: fix tcp_*_destroy() bug case Mark unhashed connections in the "bug" code path to avoid attempting to remove them twice. (cherry picked from commit 42d1a15584eb601a23c54a8af802e99473a8c4b6) --- tcp_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 0c9db6b..028fdfb 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1396,6 +1396,7 @@ static inline void _tcpconn_detach(struct tcp_connection *c) for (r=0; r<c->aliases; r++) tcpconn_listrm(tcpconn_aliases_hash[c->con_aliases[r].hash], &c->con_aliases[r], next, prev); + c->aliases = 0; } @@ -1433,6 +1434,7 @@ void tcpconn_rm(struct tcp_connection* c) for (r=0; r<c->aliases; r++) tcpconn_listrm(tcpconn_aliases_hash[c->con_aliases[r].hash], &c->con_aliases[r], next, prev); + c->aliases = 0; TCPCONN_UNLOCK; lock_destroy(&c->write_lock); #ifdef USE_TLS @@ -2985,6 +2987,7 @@ inline static void tcpconn_destroy(struct tcp_connection* tcpconn) local_timer_del(&tcp_main_ltimer, &tcpconn->timer); TCPCONN_LOCK; _tcpconn_detach(tcpconn); + tcpconn->flags &= ~(F_CONN_HASHED|F_CONN_MAIN_TIMER); TCPCONN_UNLOCK; } if (likely(!(tcpconn->flags & F_CONN_FD_CLOSED))){ @@ -3022,6 +3025,7 @@ inline static int tcpconn_put_destroy(struct tcp_connection* tcpconn) local_timer_del(&tcp_main_ltimer, &tcpconn->timer); TCPCONN_LOCK; _tcpconn_detach(tcpconn); + tcpconn->flags &= ~(F_CONN_HASHED|F_CONN_MAIN_TIMER); TCPCONN_UNLOCK; }else{ LOG(L_CRIT, "BUG: tcpconn_put_destroy: %p flags = %0x\n", @@ -4417,6 +4421,7 @@ static inline void tcpconn_destroy_all() tls_close(c, fd); #endif _tcpconn_rm(c); + c->flags &= ~F_CONN_HASHED; if (fd>0) { #ifdef TCP_FD_CACHE if (likely(cfg_get(tcp, tcp_cfg, fd_cache)))

13 years, 7 months

git:3.1: tcp: fix multiple hash removal attempts

by Andrei Pelinescu-Onciul

Module: sip-router Branch: 3.1 Commit: 521b16ea814d68f9d872e2f6e1b0f081f285254b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=521b16e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 5 00:13:36 2011 +0200 tcp: fix multiple hash removal attempts In some corner cases (pending new tcp connection created in async mode, other processes try to append data to it but fail and the initial send fails after that) it was possible to attempt removing the connection from the hash and the local timer multiple times. (cherry picked from commit 76cb63c6f120c22a134babc8948611819b9081c3) --- tcp_main.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 31fc0fa..0c9db6b 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -2167,20 +2167,19 @@ conn_wait_close: su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), fd, c->flags, strerror(errno), errno); } + /* here the connection is for sure in the hash (tcp_main will not + remove it because it's marked as PENDing) and the refcnt is at least + 2 + */ TCPCONN_LOCK; - if (c->flags & F_CONN_HASHED){ - /* if some other parallel tcp_send did send CONN_ERROR to - * tcp_main, the connection might be already detached */ - _tcpconn_detach(c); - c->flags&=~F_CONN_HASHED; - TCPCONN_UNLOCK; - tcpconn_put(c); - }else - TCPCONN_UNLOCK; + _tcpconn_detach(c); + c->flags&=~F_CONN_HASHED; + tcpconn_put(c); + TCPCONN_UNLOCK; /* dec refcnt -> mark it for destruction */ tcpconn_chld_put(c); return n; -#endif /* TCP_CONNET_WAIT */ +#endif /* TCP_CONNECT_WAIT */ release_c: tcpconn_chld_put(c); /* release c (dec refcnt & free on 0) */ end_no_deref: @@ -3594,16 +3593,22 @@ inline static int handle_ser_child(struct process_table* p, int fd_i) 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 - * CONN_NEW_PENDING_WRITE) => it cannot be destroyed here */ - if ( !(tcpconn->flags & F_CONN_PENDING) && - tcpconn_try_unhash(tcpconn) ) - tcpconn_put(tcpconn); -#else /* ! TCP_CONNECT_WAIT */ + /* if the connection is marked as pending => it might be on + * the way of reaching tcp_main (e.g. CONN_NEW_COMPLETE or + * CONN_NEW_PENDING_WRITE) => it cannot be destroyed here, + * it will be destroyed on CONN_NEW_COMPLETE / + * CONN_NEW_PENDING_WRITE or in the send error case by the + * sender process */ + if (unlikely(tcpconn->flags & F_CONN_PENDING)) { + if (tcpconn_put(tcpconn)) + tcpconn_destroy(tcpconn); + /* no need for io_watch_del(), if PENDING it should not + be watched for anything in tcp_main */ + break; + } +#endif /* TCP_CONNECT_WAIT */ if ( tcpconn_try_unhash(tcpconn) ) tcpconn_put(tcpconn); -#endif /* TCP_CONNECT_WAIT */ if ( ((tcpconn->flags & (F_CONN_WRITE_W|F_CONN_READ_W)) ) && (tcpconn->s!=-1)){ io_watch_del(&io_h, tcpconn->s, -1, IO_FD_CLOSING);

13 years, 7 months

git:master: tcp: fix send2child() error case

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: a8859f52b9dab4b3a79babe19f3d30c3dfcb95ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8859f5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 5 00:43:48 2011 +0200 tcp: fix send2child() error case If send2child() fails don't decrement the refcnt if the connection was already removed from the hash due to some other previous error (very unlikely, but possible). --- tcp_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 028fdfb..ac76dc5 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -4036,8 +4036,8 @@ static inline int handle_new_connect(struct socket_info* si) su2a(&su, sizeof(su)), tcpconn, tcpconn->s, tcpconn->flags); if(unlikely(send2child(tcpconn)<0)){ tcpconn->flags&=~F_CONN_READER; - tcpconn_put(tcpconn); - tcpconn_try_unhash(tcpconn); + if (tcpconn_try_unhash(tcpconn)) + tcpconn_put(tcpconn); tcpconn_put_destroy(tcpconn); } #endif @@ -4226,8 +4226,8 @@ send_to_child: tcpconn->flags&=~F_CONN_WRITE_W; } #endif /* TCP_ASYNC */ - tcpconn_put(tcpconn); - tcpconn_try_unhash(tcpconn); + if (tcpconn_try_unhash(tcpconn)) + tcpconn_put(tcpconn); tcpconn_put_destroy(tcpconn); /* because of the tcpconn_ref() */ } }

13 years, 7 months

git:master: tcp: fix tcp_*_destroy() bug case

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 42d1a15584eb601a23c54a8af802e99473a8c4b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42d1a15… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 5 00:35:31 2011 +0200 tcp: fix tcp_*_destroy() bug case Mark unhashed connections in the "bug" code path to avoid attempting to remove them twice. --- tcp_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 0c9db6b..028fdfb 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1396,6 +1396,7 @@ static inline void _tcpconn_detach(struct tcp_connection *c) for (r=0; r<c->aliases; r++) tcpconn_listrm(tcpconn_aliases_hash[c->con_aliases[r].hash], &c->con_aliases[r], next, prev); + c->aliases = 0; } @@ -1433,6 +1434,7 @@ void tcpconn_rm(struct tcp_connection* c) for (r=0; r<c->aliases; r++) tcpconn_listrm(tcpconn_aliases_hash[c->con_aliases[r].hash], &c->con_aliases[r], next, prev); + c->aliases = 0; TCPCONN_UNLOCK; lock_destroy(&c->write_lock); #ifdef USE_TLS @@ -2985,6 +2987,7 @@ inline static void tcpconn_destroy(struct tcp_connection* tcpconn) local_timer_del(&tcp_main_ltimer, &tcpconn->timer); TCPCONN_LOCK; _tcpconn_detach(tcpconn); + tcpconn->flags &= ~(F_CONN_HASHED|F_CONN_MAIN_TIMER); TCPCONN_UNLOCK; } if (likely(!(tcpconn->flags & F_CONN_FD_CLOSED))){ @@ -3022,6 +3025,7 @@ inline static int tcpconn_put_destroy(struct tcp_connection* tcpconn) local_timer_del(&tcp_main_ltimer, &tcpconn->timer); TCPCONN_LOCK; _tcpconn_detach(tcpconn); + tcpconn->flags &= ~(F_CONN_HASHED|F_CONN_MAIN_TIMER); TCPCONN_UNLOCK; }else{ LOG(L_CRIT, "BUG: tcpconn_put_destroy: %p flags = %0x\n", @@ -4417,6 +4421,7 @@ static inline void tcpconn_destroy_all() tls_close(c, fd); #endif _tcpconn_rm(c); + c->flags &= ~F_CONN_HASHED; if (fd>0) { #ifdef TCP_FD_CACHE if (likely(cfg_get(tcp, tcp_cfg, fd_cache)))

13 years, 7 months

git:master: tcp: fix multiple hash removal attempts

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 76cb63c6f120c22a134babc8948611819b9081c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76cb63c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 5 00:13:36 2011 +0200 tcp: fix multiple hash removal attempts In some corner cases (pending new tcp connection created in async mode, other processes try to append data to it but fail and the initial send fails after that) it was possible to attempt removing the connection from the hash and the local timer multiple times. --- tcp_main.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 31fc0fa..0c9db6b 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -2167,20 +2167,19 @@ conn_wait_close: su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), fd, c->flags, strerror(errno), errno); } + /* here the connection is for sure in the hash (tcp_main will not + remove it because it's marked as PENDing) and the refcnt is at least + 2 + */ TCPCONN_LOCK; - if (c->flags & F_CONN_HASHED){ - /* if some other parallel tcp_send did send CONN_ERROR to - * tcp_main, the connection might be already detached */ - _tcpconn_detach(c); - c->flags&=~F_CONN_HASHED; - TCPCONN_UNLOCK; - tcpconn_put(c); - }else - TCPCONN_UNLOCK; + _tcpconn_detach(c); + c->flags&=~F_CONN_HASHED; + tcpconn_put(c); + TCPCONN_UNLOCK; /* dec refcnt -> mark it for destruction */ tcpconn_chld_put(c); return n; -#endif /* TCP_CONNET_WAIT */ +#endif /* TCP_CONNECT_WAIT */ release_c: tcpconn_chld_put(c); /* release c (dec refcnt & free on 0) */ end_no_deref: @@ -3594,16 +3593,22 @@ inline static int handle_ser_child(struct process_table* p, int fd_i) 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 - * CONN_NEW_PENDING_WRITE) => it cannot be destroyed here */ - if ( !(tcpconn->flags & F_CONN_PENDING) && - tcpconn_try_unhash(tcpconn) ) - tcpconn_put(tcpconn); -#else /* ! TCP_CONNECT_WAIT */ + /* if the connection is marked as pending => it might be on + * the way of reaching tcp_main (e.g. CONN_NEW_COMPLETE or + * CONN_NEW_PENDING_WRITE) => it cannot be destroyed here, + * it will be destroyed on CONN_NEW_COMPLETE / + * CONN_NEW_PENDING_WRITE or in the send error case by the + * sender process */ + if (unlikely(tcpconn->flags & F_CONN_PENDING)) { + if (tcpconn_put(tcpconn)) + tcpconn_destroy(tcpconn); + /* no need for io_watch_del(), if PENDING it should not + be watched for anything in tcp_main */ + break; + } +#endif /* TCP_CONNECT_WAIT */ if ( tcpconn_try_unhash(tcpconn) ) tcpconn_put(tcpconn); -#endif /* TCP_CONNECT_WAIT */ if ( ((tcpconn->flags & (F_CONN_WRITE_W|F_CONN_READ_W)) ) && (tcpconn->s!=-1)){ io_watch_del(&io_h, tcpconn->s, -1, IO_FD_CLOSING);

13 years, 7 months

git:3.1: tm: allow t_on_reply() in branch_route

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: acad20d9479b2a48c29709304042b0f54032c16d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acad20d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 4 19:25:36 2011 +0200 tm: allow t_on_reply() in branch_route - same for t_on_failure() - reported by Sebastian Damm (cherry picked from commit e950f44d733f9004710f0155d794a1c797f1580d) --- modules/tm/tm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 160da26..c4ac427 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -402,9 +402,9 @@ static cmd_export_t cmds[]={ {"t_relay_cancel", w_t_relay_cancel, 0, 0, REQUEST_ROUTE}, {"t_on_failure", w_t_on_negative, 1, fixup_on_failure, - REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE }, + REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE }, {"t_on_reply", w_t_on_reply, 1, fixup_on_reply, - REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE }, + REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE }, {"t_on_branch", w_t_on_branch, 1, fixup_on_branch, REQUEST_ROUTE | FAILURE_ROUTE }, {"t_check_status", t_check_status, 1, fixup_t_check_status,

13 years, 7 months

git:master: tm: allow t_on_reply() in branch_route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e950f44d733f9004710f0155d794a1c797f1580d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e950f44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 4 19:25:36 2011 +0200 tm: allow t_on_reply() in branch_route - same for t_on_failure() - reported by Sebastian Damm --- modules/tm/tm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 05e3670..d9c5258 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -402,9 +402,9 @@ static cmd_export_t cmds[]={ {"t_relay_cancel", w_t_relay_cancel, 0, 0, REQUEST_ROUTE}, {"t_on_failure", w_t_on_negative, 1, fixup_on_failure, - REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE }, + REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE }, {"t_on_reply", w_t_on_reply, 1, fixup_on_reply, - REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE }, + REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE }, {"t_on_branch", w_t_on_branch, 1, fixup_on_branch, REQUEST_ROUTE | FAILURE_ROUTE }, {"t_check_status", t_check_status, 1, fixup_t_check_status,

13 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2011