sr-dev November 2009

sr-dev@lists.kamailio.org

30 participants
177 discussions

git:kamailio_3.0: pv: use set_force_socket()
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 7f416129580ded586b8d1f5ec0be2c1df7175a21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f41612… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:15:33 2009 +0100 pv: use set_force_socket() - use set_force_socket() instead of msg->force_send_socket (cherry picked from commit d41be35145a2f049c574d183771ea7102563e8af) --- modules_k/pv/pv_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 71186dd..16c1f70 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1882,7 +1882,7 @@ int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, if(val==NULL || (val->flags&PV_VAL_NULL)) { - msg->force_send_socket = NULL; + reset_force_socket(msg); return 0; } @@ -1904,7 +1904,7 @@ int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, si = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); if (si!=NULL) { - msg->force_send_socket = si; + set_force_socket(msg, si); } else { LM_WARN("no socket found to match [%.*s]\n", val->rs.len, val->rs.s);

1 0

git:kamailio_3.0: tm: preserve forced sockets and send flags during dns failover
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 43b0a4a3321ef8c14348b31300bd0aec15eff2be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43b0a4a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 14:48:41 2009 +0100 tm: preserve forced sockets and send flags during dns failover - fix for branches introduced as a result of dns failover not preserving the forced send socket. - dns failover branches now preserve also the original branch send flags. (cherry picked from commit 35755149a5baa028e5b0e441cebebd0d25d6063b) --- modules/tm/t_fwd.c | 72 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 23 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index e4df337..1e9644d 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -159,7 +159,7 @@ unsigned int get_on_branch(void) the sending information: t->uac[branch].request.dst, branch buffer, uri path vector a.s.o.) and runs the on_branch route. * t->uac[branch].request.dst will be filled if next_hop !=0 with the result - * of the DNS resolution (next_hop and fproto). + * of the DNS resolution (next_hop, fproto and fsocket). * If next_hop is 0 all the dst members except the send_flags are read-only * (send_flags it's updated) and are supposed to be pre-filled. * @@ -174,6 +174,8 @@ unsigned int get_on_branch(void) * for DNS resolution and the branch request.dst structure will * be filled. If 0 the branch must already have * a pre-filled valid request.dst. + * @param fsocket - forced send socket for forwarding. + * @param send_flags - special flags for sending (see SND_F_* / snd_flags_t). * @param fproto - forced proto for forwarding. Used only if next_hop!=0. * @param flags - 0 or UAC_DNS_FAILOVER_F for now. * @@ -181,8 +183,10 @@ unsigned int get_on_branch(void) */ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, int branch, str *uri, str* path, - str* next_hop, int fproto, - int flags) + str* next_hop, + struct socket_info* fsocket, + snd_flags_t snd_flags, + int fproto, int flags) { char *shbuf; struct lump* add_rm_backup, *body_lumps_backup; @@ -198,6 +202,7 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, int backup_route_type; snd_flags_t fwd_snd_flags_bak; snd_flags_t rpl_snd_flags_bak; + struct socket_info *force_send_socket_bak; struct dest_info *dst; shbuf=0; @@ -321,17 +326,22 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, ( */ if (exec_pre_script_cb(i_req, BRANCH_CB_TYPE)>0) { - /* backup ireq msg send flags */ + /* backup ireq msg send flags and force_send_socket*/ fwd_snd_flags_bak=i_req->fwd_send_flags;; rpl_snd_flags_bak=i_req->rpl_send_flags; - i_req->fwd_send_flags=dst->send_flags /* intial value */; + force_send_socket_bak=i_req->force_send_socket; + /* set the new values */ + i_req->fwd_send_flags=snd_flags /* intial value */; + set_force_socket(i_req, fsocket); if (run_top_route(branch_rt.rlist[branch_route], i_req, 0) < 0) { LOG(L_ERR, "Error in run_top_route\n"); } - /* update dst send_flags */ - dst->send_flags=i_req->fwd_send_flags; - /* restore ireq_msg flags */ + /* update dst send_flags and send socket*/ + snd_flags=i_req->fwd_send_flags; + fsocket=i_req->force_send_socket; + /* restore ireq_msg force_send_socket & flags */ + set_force_socket(i_req, force_send_socket_bak); i_req->fwd_send_flags=fwd_snd_flags_bak; i_req->rpl_send_flags=rpl_snd_flags_bak; exec_post_script_cb(i_req, BRANCH_CB_TYPE); @@ -376,11 +386,12 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, if (likely(next_hop!=0 || (flags & UAC_DNS_FAILOVER_F))){ /* next_hop present => use it for dns resolution */ #ifdef USE_DNS_FAILOVER - if (uri2dst(&t->uac[branch].dns_h, dst, i_req, + if (uri2dst2(&t->uac[branch].dns_h, dst, fsocket, snd_flags, next_hop?next_hop:uri, fproto) == 0) #else /* dst filled from the uri & request (send_socket) */ - if (uri2dst(dst, i_req, next_hop?next_hop:uri, fproto)==0) + if (uri2dst2(dst, fsocket, snd_flags, + next_hop?next_hop:uri, fproto)==0) #endif { ret=E_BAD_ADDRESS; @@ -452,6 +463,7 @@ error03: i_req->parsed_uri=parsed_uri_bak; i_req->parsed_uri_ok=parsed_uri_ok_bak; i_req->path_vec=path_bak; + /* Delete the duplicated lump lists, this will also delete * all lumps created here, such as lumps created in per-branch * routing sections, Via, and Content-Length headers created in @@ -603,6 +615,8 @@ int add_blind_uac( /*struct cell *t*/ ) * uri format, e.g.: "<sip:1.2.3.4;lr>, <sip:5.6.7.8;lr>"). * @param proxy - proxy structure. If non-null it takes precedence over * next_hop/uri and it will be used for forwarding. + * @param fsocket - forced forward send socket (can be 0). + * @param snd_flags - special send flags (see SND_F_* / snd_flags_t) * @param proto - forced protocol for forwarding (overrides the protocol * in next_hop/uri or proxy if != PROTO_NONE). * @param flags - special flags passed to prepare_new_uac(). @@ -611,6 +625,7 @@ int add_blind_uac( /*struct cell *t*/ ) */ static int add_uac( struct cell *t, struct sip_msg *request, str *uri, str* next_hop, str* path, struct proxy_l *proxy, + struct socket_info* fsocket, snd_flags_t snd_flags, int proto, int flags) { @@ -653,7 +668,8 @@ static int add_uac( struct cell *t, struct sip_msg *request, str *uri, /* now message printing starts ... */ if (unlikely( (ret=prepare_new_uac(t, request, branch, uri, path, - next_hop, proto, flags)) < 0)){ + next_hop, fsocket, snd_flags, + proto, flags)) < 0)){ ser_error=ret; goto error01; } @@ -689,7 +705,10 @@ error: the failed branch to construct the new message in case of DNS failover. */ static int add_uac_from_buf( struct cell *t, struct sip_msg *request, - str *uri, str* path, int proto, + str *uri, str* path, + struct socket_info* fsocket, + snd_flags_t send_flags, + int proto, char *buf, short buf_len) { @@ -713,8 +732,8 @@ static int add_uac_from_buf( struct cell *t, struct sip_msg *request, goto error; } - if (uri2dst(&t->uac[branch].dns_h, &t->uac[branch].request.dst, - request, uri, proto) == 0) + if (uri2dst2(&t->uac[branch].dns_h, &t->uac[branch].request.dst, + fsocket, send_flags, uri, proto) == 0) { ret=ser_error=E_BAD_ADDRESS; goto error; @@ -820,21 +839,29 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, dns_srv_handle_cpy(&t->uac[t->nr_of_outgoings].dns_h, &old_uac->dns_h); - if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)) + if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header. * The drawback is that the send_socket is not corrected * in the rest of the message, only in the VIA HF (Miklos) */ ret=add_uac_from_buf(t, msg, &old_uac->uri, &old_uac->path, + (old_uac->request.dst.send_flags & + SND_F_FORCE_SOCKET)? + old_uac->request.dst.send_sock:0, + old_uac->request.dst.send_flags, old_uac->request.dst.proto, old_uac->request.buffer, old_uac->request.buffer_len); - else + }else /* add_uac will use dns_h => next_hop will be ignored. * Unfortunately we can't reuse the old buffer, the branch id * must be changed and the send_socket might be different => * re-create the whole uac */ ret=add_uac(t, msg, &old_uac->uri, 0, &old_uac->path, 0, + (old_uac->request.dst.send_flags & + SND_F_FORCE_SOCKET)? + old_uac->request.dst.send_sock:0, + old_uac->request.dst.send_flags, old_uac->request.dst.proto, UAC_DNS_FAILOVER_F); if (ret<0){ @@ -906,7 +933,7 @@ int e2e_cancel_branch( struct sip_msg *cancel_msg, struct cell *t_cancel, if (unlikely((ret=prepare_new_uac( t_cancel, cancel_msg, branch, &t_invite->uac[branch].uri, &t_invite->uac[branch].path, - 0, PROTO_NONE, 0)) <0)){ + 0, 0, 0, PROTO_NONE, 0)) <0)){ ser_error=ret; goto error; } @@ -1242,7 +1269,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , int try_new; int lock_replies; str dst_uri, path; - struct socket_info* si, *backup_si; + struct socket_info* si; flag_t backup_bflags = 0; flag_t bflags = 0; @@ -1267,7 +1294,6 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , } } - backup_si = p_msg->force_send_socket; getbflagsval(0, &backup_bflags); /* if no more specific error code is known, use this */ @@ -1303,7 +1329,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , #endif try_new=1; branch_ret=add_uac( t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), - &p_msg->path_vec, proxy, proto, 0); + &p_msg->path_vec, proxy, p_msg->force_send_socket, + p_msg->fwd_send_flags, proto, 0); if (branch_ret>=0) added_branches |= 1<<branch_ret; else @@ -1314,12 +1341,12 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, &bflags, &si))) { try_new++; - p_msg->force_send_socket = si; setbflagsval(0, bflags); branch_ret=add_uac( t, p_msg, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, - &path, proxy, proto, 0); + &path, proxy, si, p_msg->fwd_send_flags, + proto, 0); /* pick some of the errors in case things go wrong; note that picking lowest error is just as good as any other algorithm which picks any other negative @@ -1332,7 +1359,6 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , /* consume processed branches */ clear_branches(); - p_msg->force_send_socket = backup_si; setbflagsval(0, backup_bflags); /* don't forget to clear all branches processed so far */

1 0

git:kamailio_3.0: rr(s): use set_force_socket()
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 5107ad3a9df7a644f4ec1f79cbc363208b0519d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5107ad3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:12:52 2009 +0100 rr(s): use set_force_socket() - use set_force_socket() instead of msg->force_send_socket --- modules_s/rr/loose.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_s/rr/loose.c b/modules_s/rr/loose.c index 33803fe..0ba9337 100644 --- a/modules_s/rr/loose.c +++ b/modules_s/rr/loose.c @@ -901,9 +901,9 @@ static inline int after_loose(struct sip_msg* _m, struct sip_uri* _pru, int _rou LOG(L_ERR, "after_loose: Error while parsing the second route header\n"); return RR_ERROR; } - _m->force_send_socket = grep_sock_info(&parsed_uri.host, - parsed_uri.port_no, - parsed_uri.proto); + set_force_socket(_m, grep_sock_info(&parsed_uri.host, + parsed_uri.port_no, + parsed_uri.proto) ); if (_m->force_send_socket == 0) LOG(L_WARN, "after_loose: send socket cannot be set" " based on the second route header\n");

1 0

git:kamailio_3.0: core: extra flag when forcing a socket
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: d2669142fa6ab65adebdb5f01aa71d7703ec2567 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d266914… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 14:43:38 2009 +0100 core: extra flag when forcing a socket - when forcing a socket set an extra send flag (SND_F_FORCE_SOCKET), so that later we can tell if the socket in the dst structure was forced or not (useful for forcing a specific source ip on tcp or for keeping the forced socket during dns failover in tm). - added set_force_socket(msg, sock) and reset_force_socket(msg) macros that should be used instead of directly setting msg->force_send_socket (they take care of any extra work, like setting/resetting flags). (cherry picked from commit 8fb1a2121ebe5c17681e7921cd96d3fe9a5dab80) --- action.c | 2 +- ip_addr.h | 1 + parser/msg_parser.h | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index b8256a7..ddbf445 100644 --- a/action.c +++ b/action.c @@ -1201,7 +1201,7 @@ match_cleanup: ret=E_BUG; goto error; } - msg->force_send_socket=(struct socket_info*)a->val[0].u.data; + set_force_socket(msg, (struct socket_info*)a->val[0].u.data); ret=1; /* continue processing */ break; diff --git a/ip_addr.h b/ip_addr.h index 355fc77..2983e46 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -140,6 +140,7 @@ struct receive_info{ /* send flags */ #define SND_F_FORCE_CON_REUSE 1 /* reuse an existing connection or fail */ #define SND_F_CON_CLOSE 2 /* close the connection after sending */ +#define SND_F_FORCE_SOCKET 4 /* send socket in dst is forced */ typedef unsigned char snd_flags_t; diff --git a/parser/msg_parser.h b/parser/msg_parser.h index ce4c81d..adedddb 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -467,4 +467,23 @@ int set_path_vector(struct sip_msg* msg, str* path); void reset_path_vector(struct sip_msg* msg); + +/** force a specific send socket for forwarding a request. + * @param msg - sip msg. + * @param fsocket - forced socket, pointer to struct socket_info, can be 0 (in + * which case it's equivalent to reset_force_socket()). + */ +#define set_force_socket(msg, fsocket) \ + do { \ + (msg)->force_send_socket=(fsocket); \ + if ((msg)->force_send_socket) \ + (msg)->fwd_send_flags |= SND_F_FORCE_SOCKET; \ + else \ + (msg)->fwd_send_flags &= ~SND_F_FORCE_SOCKET; \ + } while (0) + +/** reset a previously forced send socket. */ +#define reset_force_socket(msg) set_force_socket(msg, 0) + + #endif

1 0

git:kamailio_3.0: kex: use set_force_socket()
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 1fa3bdab6163b1301fcd6f10ffd08304b0723859 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1fa3bda… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:14:31 2009 +0100 kex: use set_force_socket() - use set_force_socket() instead of msg->force_send_socket (cherry picked from commit 097bdc69d58956e1678b1d6776d60187b079b731) --- modules_k/kex/km_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/kex/km_core.c b/modules_k/kex/km_core.c index 72e2dde..0abb673 100644 --- a/modules_k/kex/km_core.c +++ b/modules_k/kex/km_core.c @@ -44,7 +44,7 @@ int w_km_append_branch(struct sip_msg *msg, char *uri, str *sq) ret = km_append_branch(msg, 0, &msg->dst_uri, &msg->path_vec, q, branch_flags, msg->force_send_socket); /* reset all branch info */ - msg->force_send_socket = 0; + reset_force_socket(msg); setbflagsval(0, 0); if(msg->dst_uri.s!=0) pkg_free(msg->dst_uri.s);

1 0

git:kamailio_3.0: domainpolicy: use set_force_socket()
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 2c3439ade89c5cddf601653603510c0fab4be5c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c3439a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:13:36 2009 +0100 domainpolicy: use set_force_socket() - use set_force_socket() instead of msg->force_send_socket (cherry picked from commit 67b7508a1c8964abbf55f3f09363a45f8aa871f8) --- modules_k/domainpolicy/domainpolicy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/domainpolicy/domainpolicy.c b/modules_k/domainpolicy/domainpolicy.c index ee8cc29..f77095e 100644 --- a/modules_k/domainpolicy/domainpolicy.c +++ b/modules_k/domainpolicy/domainpolicy.c @@ -850,7 +850,7 @@ int dp_apply_policy(struct sip_msg* _msg, char* _s1, char* _s2) { } si = grep_sock_info( &host, (unsigned short) port, (unsigned short) proto); if (si) { - _msg->force_send_socket = si; + set_force_socket(_msg, si); } else { LM_WARN("could not find socket for" "send_socket '%.*s'\n", val.s.len, ZSW(val.s.s));

1 0

git:kamailio_3.0: registrar(s): use set_force_socket()
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: a2af320d2e6cf177b1ba855fa9e1098c48787c09 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2af320… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:11:53 2009 +0100 registrar(s): use set_force_socket() - use set_force_socket() instead of msg->force_send_socket (cherry picked from commit 6054da6272702ce9ab3f7c48b468bf3fefe16b03) --- modules_s/registrar/lookup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/registrar/lookup.c b/modules_s/registrar/lookup.c index 6363518..857e1e0 100644 --- a/modules_s/registrar/lookup.c +++ b/modules_s/registrar/lookup.c @@ -139,7 +139,7 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) } if (ptr->sock) { - _m->force_send_socket = ptr->sock; + set_force_socket(_m, ptr->sock); } skip_rewrite_uri: @@ -302,7 +302,7 @@ int lookup2(struct sip_msg* msg, char* table, char* p2) } if (ptr->sock) { - msg->force_send_socket = ptr->sock; + set_force_socket(msg, ptr->sock); } skip_rewrite_uri:

1 0

git:kamailio_3.0: tm: use set_force_socket() instead of msg-> force_send_socket
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 78e168c98b2bbc923bcfe7365c0343a566d557a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78e168c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 14:53:55 2009 +0100 tm: use set_force_socket() instead of msg->force_send_socket (cherry picked from commit d525316e8697533bea40a0e71a150d870caa1d7a) --- modules/tm/t_serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 945afcb..fc9c527 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -447,7 +447,7 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) else reset_dst_uri(msg); if (path.s && path.len) set_path_vector(msg, &path); else reset_path_vector(msg); - msg->force_send_socket = sock; + set_force_socket(msg, sock); setbflagsval(0, flags); if (avp->flags & Q_FLAG) {

1 0

git:master: Merge remote branch 'origin/sr_3.0'
by Andrei Pelinescu-Onciul 06 Nov '09

06 Nov '09

Module: sip-router Branch: master Commit: 470d30ac7dbe70a1e7b348f4dc68ce4e98cd2d8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=470d30a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 6 08:56:40 2009 +0100 Merge remote branch 'origin/sr_3.0' latest sr_3.0 fixes. * origin/sr_3.0: (36 commits) core: added id to every field of gw table schema tcp: use the forced socket ip as source tmx: pv_t_copy_msg: copy also the send flags textops(k): msg_apply_changes: preserve the send flags seas: use set_force_socket() rr(k): use set_force_socket() registrar(k): use set_force_socket() pv: use set_force_socket() kex: use set_force_socket() domainpolicy: use set_force_socket() rr(s): use set_force_socket() registrar(s): use set_force_socket() tm: use set_force_socket() instead of msg->force_send_socket tm: preserve forced sockets and send flags during dns failover core: extra flag when forcing a socket core: kamailio mode config parser fix core: PAI and PPI parsing support fixed core: dset minor cleanups core: append_branch() sets also the send_socket, path & flags remove extra backslash in make modules-doc action ... ---

1 0

tcp problem
by jh＠tutpro.com 06 Nov '09

06 Nov '09

i have twinkle registered from behind nat over tcp and another sip phone registered over udp using the same aor and q value. this aor is then called by another sip phone and sr forks the invite: Oct 28 17:58:37 localhost /usr/sbin/sip-proxy[28989]: INFO: Routing first INVITE to <sip:foo@192.168.0.169:5074;transport=tcp> and <<sip:JzlUogbN0_q5BaWAN1Zv@xx.xx.xx.xx>;q=0> ... twinkle answers and sends 200 ok. 200 ok is received by the calling phone, which then sends ack to twinkle via sr, the problem is that twinkle never receives the ack. instead sr reports a tcp error: Oct 28 17:58:46 localhost /usr/sbin/sip-proxy[28994]: INFO: Routing in-dialog ACK from <sip:foo.bar@foo.bar> to <sip:foo@192.168.0.169:5074;transport=TCP> Oct 28 17:58:46 lohi /usr/sbin/sip-proxy[28994]: WARNING: <core> [tcp_main.c:1200]: WARNING: tcp_do_connect 192.168.0.169:5074: could not find corresponding listening socket for 192.X.Y.2, using default... ... Oct 28 17:58:51 localhost /usr/sbin/sip-proxy[29140]: ERROR: <core> [tcp_main.c:3747]: connect 192.168.0.169:5074 failed (timeout) weird thing about the warning is that it mentions ip address 192.X.Y.2, which is not any of the ip addresses sr has configured to listen at. 192.X.Y.2 is the ip address of eth0 of sr host, but sr is listening at 192.X.Y.10, which is address of interface eth0:1. am i missing some magic from sr tcp config or what could be the reason that sr is trying to find non-existing listening socket? i do have wireshark capture of this if it helps. -- juha

3 15

← Newer
1
...
11
12
13
14
15
16
17
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2009