Module: kamailio Branch: 4.2 Commit: 80a7b7593a68dd2686a5c17f9f85f561bb694785 URL: https://github.com/kamailio/kamailio/commit/80a7b7593a68dd2686a5c17f9f85f561...
Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2015-03-03T07:45:31+01:00
core: cleaned debug messages and added safety check for bind address
(cherry picked from commit 2549f7a6361de36e0dde14de3d5c4c076564871c)
---
Modified: tcp_main.c
---
Diff: https://github.com/kamailio/kamailio/commit/80a7b7593a68dd2686a5c17f9f85f561... Patch: https://github.com/kamailio/kamailio/commit/80a7b7593a68dd2686a5c17f9f85f561...
---
diff --git a/tcp_main.c b/tcp_main.c index 70409f2..5af279f 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3862,17 +3862,17 @@ inline static int send2child(struct tcp_connection* tcpconn) if(tcpconn->rcv.bind_address->workers>0) { wfirst = tcpconn->rcv.bind_address->workers_tcpidx; wlast = wfirst + tcpconn->rcv.bind_address->workers; - LM_DBG("===== checking per-socket specific workers (%d/%d..%d/%d) [%s]\n", + LM_DBG("checking per-socket specific workers (%d/%d..%d/%d) [%s]\n", tcp_children[wfirst].pid, tcp_children[wfirst].proc_no, tcp_children[wlast-1].pid, tcp_children[wlast-1].proc_no, - tcpconn->rcv.bind_address->sock_str.s); + (tcpconn->rcv.bind_address)?tcpconn->rcv.bind_address->sock_str.s:""); } else { wfirst = 0; wlast = tcp_sockets_gworkers - 1; - LM_DBG("+++++ checking per-socket generic workers (%d/%d..%d/%d) [%s]\n", + LM_DBG("checking per-socket generic workers (%d/%d..%d/%d) [%s]\n", tcp_children[wfirst].pid, tcp_children[wfirst].proc_no, tcp_children[wlast-1].pid, tcp_children[wlast-1].proc_no, - tcpconn->rcv.bind_address->sock_str.s); + (tcpconn->rcv.bind_address)?tcpconn->rcv.bind_address->sock_str.s:""); } idx = wfirst; min_busy = tcp_children[idx].busy; @@ -3899,7 +3899,8 @@ inline static int send2child(struct tcp_connection* tcpconn) } LM_DBG("selected tcp worker %d %d(%ld) for activity on [%s], %p\n", idx, tcp_children[idx].proc_no, (long)tcp_children[idx].pid, - tcpconn->rcv.bind_address->sock_str.s, tcpconn); + (tcpconn->rcv.bind_address)?tcpconn->rcv.bind_address->sock_str.s:"", + tcpconn); /* first make sure this child doesn't have pending request for * tcp_main (to avoid a possible deadlock: e.g. child wants to * send a release command, but the master fills its socket buffer
-
Daniel-Constantin Mierla