sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:5.2:d815945c: gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: d815945cdf85250877c89b3368506d444aa0ff2f URL: https://github.com/kamailio/kamailio/commit/d815945cdf85250877c89b3368506d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:40+02:00 gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit d9a1cbc8f66f9fd0991048e5e1ba1579916a092e) --- Modified: src/modules/gzcompress/gzcompress_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d815945cdf85250877c89b3368506d4… Patch: https://github.com/kamailio/kamailio/commit/d815945cdf85250877c89b3368506d4… --- diff --git a/src/modules/gzcompress/gzcompress_mod.c b/src/modules/gzcompress/gzcompress_mod.c index 3e06c1c267..3ff22d723d 100644 --- a/src/modules/gzcompress/gzcompress_mod.c +++ b/src/modules/gzcompress/gzcompress_mod.c @@ -338,6 +338,7 @@ int gzc_msg_sent(sr_event_param_t *evp) unsigned long olen; unsigned long nlen; int ret; + str nbuf = STR_NULL; obuf = (str*)evp->data; memset(&msg, 0, sizeof(sip_msg_t)); @@ -383,7 +384,15 @@ int gzc_msg_sent(sr_event_param_t *evp) goto done; } - obuf->s = gzc_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = gzc_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:5.2:0df6f49f: dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 0df6f49fe7a13ce6c01542a16fdd8932043f5ec9 URL: https://github.com/kamailio/kamailio/commit/0df6f49fe7a13ce6c01542a16fdd893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:31+02:00 dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit ad8d9628da27a3ab68b005ef52842784af6bda3a) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/0df6f49fe7a13ce6c01542a16fdd893… Patch: https://github.com/kamailio/kamailio/commit/0df6f49fe7a13ce6c01542a16fdd893… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index b97e8f7123..29fcaa7494 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -364,6 +364,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) struct via_body *via; hdr_field_t *hfk = NULL; sr_cfgenv_t *cenv = NULL; + str nbuf = STR_NULL; obuf = (str*)evp->data; memset(&msg, 0, sizeof(sip_msg_t)); @@ -520,11 +521,13 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) } } /* replace old msg content */ - obuf->s = pkg_malloc((tbuf_len+1)*sizeof(char)); - if(obuf->s==NULL) { + nbuf.s = pkg_malloc((tbuf_len+1)*sizeof(char)); + if(nbuf.s==NULL) { LM_ERR("not enough memory for new message\n"); goto done; } + pkg_free(obuf->s); + obuf->s = nbuf.s; memcpy(obuf->s, tbuf, tbuf_len); obuf->s[tbuf_len] = 0; obuf->len = tbuf_len;

1 0

git:5.2:bbac0720: topos: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: bbac07207f55216ece4fad4d1aed2ed578cb0e15 URL: https://github.com/kamailio/kamailio/commit/bbac07207f55216ece4fad4d1aed2ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:22+02:00 topos: free old outbound buffer inside SREV_NET_DATA_OUT callback - GH #2027 (cherry picked from commit 21816a11a56628a9eee17765645fcf03d57929bd) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bbac07207f55216ece4fad4d1aed2ed… Patch: https://github.com/kamailio/kamailio/commit/bbac07207f55216ece4fad4d1aed2ed… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index f6b6a3a2f5..942c545d58 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -390,6 +390,7 @@ int tps_msg_sent(sr_event_param_t *evp) str *obuf; int dialog; int local; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -443,7 +444,15 @@ int tps_msg_sent(sr_event_param_t *evp) tps_response_sent(&msg); } - obuf->s = tps_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = tps_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:5.2:aaeb0ca5: topoh: free old outbound buffer inside th_msg_sent()
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: aaeb0ca500f4cbf98631c58da5289eea30b3dd92 URL: https://github.com/kamailio/kamailio/commit/aaeb0ca500f4cbf98631c58da5289ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:10+02:00 topoh: free old outbound buffer inside th_msg_sent() - GH #2027 (cherry picked from commit 37a1765853294016f43bd633667cd623aaaa2d3e) --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aaeb0ca500f4cbf98631c58da5289ee… Patch: https://github.com/kamailio/kamailio/commit/aaeb0ca500f4cbf98631c58da5289ee… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index c1a597eb1e..0eb5345598 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -411,6 +411,7 @@ int th_msg_sent(sr_event_param_t *evp) int direction; int dialog; int local; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -497,7 +498,15 @@ int th_msg_sent(sr_event_param_t *evp) } ready: - obuf->s = th_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = th_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:5.2:891bd927: core: forward - clone outbound buffer for SREV_NET_DATA_OUT event
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 891bd927f3e519bb9fb2f23a65f21f82f2f7e0af URL: https://github.com/kamailio/kamailio/commit/891bd927f3e519bb9fb2f23a65f21f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:43:58+02:00 core: forward - clone outbound buffer for SREV_NET_DATA_OUT event - this event can execute a series of callbacks, leading to leak if only the core function does pkg free - GH #2027 (cherry picked from commit 98249e2cc97e818cf7ad492132ecfea2ce13a78b) --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/891bd927f3e519bb9fb2f23a65f21f8… Patch: https://github.com/kamailio/kamailio/commit/891bd927f3e519bb9fb2f23a65f21f8… --- diff --git a/src/core/forward.h b/src/core/forward.h index d039900aac..a629748686 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -136,9 +136,18 @@ static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len, outb.s = buf; outb.len = len; if(!(flags&1)) { - evp.data = (void*)&outb; - evp.dst = dst; - sr_event_exec(SREV_NET_DATA_OUT, &evp); + if(sr_event_enabled(SREV_NET_DATA_OUT)) { + outb.s = (char*)pkg_malloc(len + 1); + if(outb.s==NULL) { + LM_ERR("failed to clone outgoing buffer\n"); + return -1; + } + memcpy(outb.s, buf, len); + outb.s[len] = '\0'; + evp.data = (void*)&outb; + evp.dst = dst; + sr_event_exec(SREV_NET_DATA_OUT, &evp); + } } if(outb.s==NULL) {

1 0

git:master:18eb1c97: pv: added {s.count, c} transformation
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: 18eb1c973c5d863a562864c2b77b4e1d520f9406 URL: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T11:17:17+02:00 pv: added {s.count,c} transformation - count how many times c appears in the pv value "abababa"{s.count,a} => 4 --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… Patch: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 8ab46d328f..ea693bffd4 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1207,6 +1207,42 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s[val->rs.len] = '\0'; break; + case TR_S_COUNT: + if(tp==NULL) + { + LM_ERR("invalid parameters (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + if(!(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + } + if(tp->type==TR_PARAM_STRING) + { + st = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("cannot get parameter value (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + st = v.rs; + } + LM_DBG("counting [%.*s](%d) in [%.*s](%d)\n", + st.len, st.s, st.len, val->rs.len, val->rs.s, val->rs.len); + j = 0; + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + j++; + } + } + val->flags = PV_TYPE_INT|PV_VAL_INT|PV_VAL_STR; + val->ri = j; + val->rs.s = int2str(j, &val->rs.len); + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2575,6 +2611,26 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==9 && strncasecmp(name.s, "unbracket", 9)==0) { t->subtype = TR_S_UNBRACKET; goto done; + } else if(name.len==5 && strncasecmp(name.s, "count", 5)==0) { + t->subtype = TR_S_COUNT; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid count transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid count transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index da2cb87624..0b579e4b27 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -42,7 +42,7 @@ enum _tr_s_subtype { TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE, - TR_S_UNBRACKET + TR_S_UNBRACKET, TR_S_COUNT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio/kamailio] UAC (#2036)
by Antoineb2s 19 Aug '19

19 Aug '19

Hi, I'm trying to register to a SIP provider (v5.2.4), so I added in kamailio.cfg: ... loadmodule "uac.so" ... modparam("rr", "append_fromtag", 1) modparam("uac", "credential", "user:host_provider_ip:password") modparam("uac", "reg_retry_interval", 300) Seems that nothing happens after a service restart. I also tried : `kamcmd uac.reg_dump error: 500 - command uac.reg_dump not found` Is there something I misunderstood ? Thanks in advanced ! -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2036

2 2

git:master:4acc8aa7: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 4acc8aa71b50efc0f8ec073d711dda27b928e991 URL: https://github.com/kamailio/kamailio/commit/4acc8aa71b50efc0f8ec073d711dda2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-19T11:47:13+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/4acc8aa71b50efc0f8ec073d711dda2… Patch: https://github.com/kamailio/kamailio/commit/4acc8aa71b50efc0f8ec073d711dda2… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index cbb49366e7..357c41d388 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -230,9 +230,11 @@ var(uri)\n"); https://www.digitalocean.com/community/questions/how-to-upgrade-curl-in -centos6 - Note: http_client_query exported by the http_client API returns the - first line of the HTTP response (query_params.oneline = 1), but the - lost module requires the complete response message, which requires - query_params.oneline set to 0. In the case lost_query is used with the - default http_client API, dereferencing location via HTTP provided with - the Geolocation header causes an error. + Note: http_client_query exported by the http_client API returns by + default the first line of the HTTP response (query_params.oneline = 1), + but the lost module requires the complete response message, which + requires query_params.oneline set to 0. In the case lost_query is used + with the default http_client API, dereferencing location via HTTP + provided with the Geolocation header causes an error. Therefore, to + work properlu=y, it requires to set http_client module parameter + query_result to 0.

1 0

git:master:a743a6c7: core: tcp - debug messages when looking up tcp connection
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: a743a6c7d3f7b65a366251dd121011725964d07b URL: https://github.com/kamailio/kamailio/commit/a743a6c7d3f7b65a366251dd1210117… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: tcp - debug messages when looking up tcp connection --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/a743a6c7d3f7b65a366251dd1210117… Patch: https://github.com/kamailio/kamailio/commit/a743a6c7d3f7b65a366251dd1210117… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 7ecaf47eb6..819cfe9c3f 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1622,7 +1622,7 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, int is_local_ip_any; #ifdef EXTRA_DEBUG - LM_DBG("%d port %d\n",id, port); + LM_DBG("%d port %d\n", id, port); if (ip) print_ip("tcpconn_find: ip ", ip, "\n"); #endif if (likely(id)){ @@ -1632,7 +1632,10 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, LM_DBG("c=%p, c->id=%d, port=%d\n", c, c->id, c->rcv.src_port); print_ip("ip=", &c->rcv.src_ip, "\n"); #endif - if ((id==c->id)&&(c->state!=S_CONN_BAD)) return c; + if ((id==c->id)&&(c->state!=S_CONN_BAD)) { + LM_DBG("found connection by id: %d\n", id); + return c; + } } }else if (likely(ip)){ hash=tcp_addr_hash(ip, port, l_ip, l_port); @@ -1648,8 +1651,11 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)) - ) + ) { + LM_DBG("found connection by peer address (id: %d)\n", + a->parent->id); return a->parent; + } } } return 0;

1 0

git:master:9ff491a8: tm: propagate tcp connection id in outbound branch dst structure
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 9ff491a881f326b5ee6eee4fd40c427f8d83ecf0 URL: https://github.com/kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 tm: propagate tcp connection id in outbound branch dst structure --- Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… Patch: https://github.com/kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index d814e3d5b2..0e484d9ebf 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -284,8 +284,9 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, e2e ACKs do not establish a transaction and are fwd-ed statelessly */ if ( p_msg->REQ_METHOD==METHOD_ACK) { LM_DBG("forwarding ACK statelessly\n"); + init_dest_info(&dst); + dst.id = p_msg->otcpid; if (proxy==0) { - init_dest_info(&dst); dst.proto=proto; if (get_uri_send_info(GET_NEXT_HOP(p_msg), &host, &port, &dst.proto, &comp)!=0){ @@ -299,7 +300,6 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, * of it */ ret=forward_request(p_msg, &host, port, &dst); } else { - init_dest_info(&dst); dst.proto=get_proto(proto, proxy->proto); proxy2su(&dst.to, proxy); /* dst->send_sock not set, but forward_request will take care diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 213f0df746..33a50d7799 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1596,22 +1596,15 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, struct proxy_l * proxy, int proto) { int branch_ret, lowest_ret; - str current_uri; branch_bm_t added_branches; int first_branch; - int i, q; + int i; struct cell *t_invite; int success_branch; int try_new; int lock_replies; - str dst_uri, path, instance, ruid, location_ua; - struct socket_info* si; flag_t backup_bflags = 0; - flag_t bflags = 0; - - - /* make -Wall happy */ - current_uri.s=0; + branch_data_t obranch; getbflagsval(0, &backup_bflags); @@ -1667,40 +1660,46 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, */ if (ruri_get_forking_state()) { try_new=1; - branch_ret=add_uac( t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), + branch_ret=add_uac(t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), &p_msg->path_vec, proxy, p_msg->force_send_socket, p_msg->fwd_send_flags, proto, (p_msg->dst_uri.len)?0:UAC_SKIP_BR_DST_F, &p_msg->instance, &p_msg->ruid, &p_msg->location_ua); /* test if cancel was received meanwhile */ if (t->flags & T_CANCELED) goto canceled; - if (branch_ret>=0) + if (branch_ret>=0) { added_branches |= 1<<branch_ret; - else + t->uac[branch_ret].request.dst.id = p_msg->otcpid; + } else { lowest_ret=MIN_int(lowest_ret, branch_ret); - } else try_new=0; + } + } else { + try_new=0; + } + memset(&obranch, 0, sizeof(branch_data_t)); init_branch_iterator(); - while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, - &bflags, &si, &ruid, &instance, &location_ua))) { + while(next_branch_data(&obranch)==1) { try_new++; - setbflagsval(0, bflags); + setbflagsval(0, obranch.flags); - branch_ret=add_uac( t, p_msg, &current_uri, - (dst_uri.len) ? (&dst_uri) : &current_uri, - &path, proxy, si, p_msg->fwd_send_flags, - proto, (dst_uri.len)?0:UAC_SKIP_BR_DST_F, &instance, - &ruid, &location_ua); + branch_ret=add_uac(t, p_msg, &obranch.uri, + (obranch.dst_uri.len>0) ? &obranch.dst_uri : &obranch.uri, + &obranch.path, proxy, obranch.force_socket, p_msg->fwd_send_flags, + proto, (obranch.dst_uri.len>0)?0:UAC_SKIP_BR_DST_F, + &obranch.instance, &obranch.ruid, &obranch.location_ua); /* test if cancel was received meanwhile */ if (t->flags & T_CANCELED) goto canceled; /* 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 * branch result */ - if (branch_ret>=0) + if (branch_ret>=0) { added_branches |= 1<<branch_ret; - else + t->uac[branch_ret].request.dst.id = obranch.otcpid; + } else { lowest_ret=MIN_int(lowest_ret, branch_ret); + } } /* consume processed branches */ clear_branches();

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019