sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

git:master:e28f4644: siptrace: trace incoming CANCEL into a dedicated callback

by Federico Cabiddu

Module: kamailio Branch: master Commit: e28f464457eea47cc606c73cbfe4b30fcc8b542a URL: https://github.com/kamailio/kamailio/commit/e28f464457eea47cc606c73cbfe4b30… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-03T11:59:50+02:00 siptrace: trace incoming CANCEL into a dedicated callback --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/e28f464457eea47cc606c73cbfe4b30… Patch: https://github.com/kamailio/kamailio/commit/e28f464457eea47cc606c73cbfe4b30… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index b000d1ac8d..3c1ec436d7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -64,8 +64,7 @@ MODULE_VERSION #define SIPTRACE_ANYADDR_LEN (sizeof(SIPTRACE_ANYADDR) - 1) #define trace_is_off(_msg) \ - ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \ - || ((trace_flag != 0) && (_msg->flags & trace_flag) == 0)) + (((_msg)->msg_flags & FL_SIPTRACE) == 0) #define is_null_pv(_str) \ (!str_strcmp(&_str, pv_get_null_str())) @@ -98,6 +97,7 @@ static int w_hlog2(struct sip_msg *, char *correlationid, char *message); static int sip_trace_store_db(siptrace_data_t *sto); static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps); +static void trace_cancel_in(struct cell *t, int type, struct tmcb_params *ps); static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps); static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps); static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps); @@ -1254,6 +1254,31 @@ static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2) return ki_sip_trace_mode(msg, &smode); } +static void trace_cancel_in(struct cell *t, int type, struct tmcb_params *ps) +{ + siptrace_info_t* info; + sip_msg_t *msg; + + if(t == NULL || ps == NULL) { + LM_ERR("unexpected parameter values\n"); + return; + } + + if(ps->flags & TMCB_RETR_F) { + LM_DBG("retransmission - ignoring\n"); + return; + } + + info = (siptrace_info_t *)(*ps->param); + msg = ps->req; + if(tmb.register_tmcb(msg, 0, TMCB_RESPONSE_READY, trace_onreply_out, info, 0) <= 0) { + LM_ERR("can't register trace_onreply_out\n"); + return; + } + msg->msg_flags |= FL_SIPTRACE; + sip_trace_helper(msg, NULL, NULL, NULL, NULL, 1); +} + static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) { siptrace_data_t sto; @@ -1296,19 +1321,9 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) * and can register a callback for the reply */ memset(&sto, 0, sizeof(siptrace_data_t)); - if (unlikely(type == TMCB_E2ECANCEL_IN)) { - msg->msg_flags |= FL_SIPTRACE; - - if(tmb.register_tmcb(msg, 0, TMCB_RESPONSE_READY, trace_onreply_out, info, 0) - <= 0) { - LM_ERR("can't register trace_onreply_out\n"); - return; - } - } else { - if(traced_user_avp.n != 0) - sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, - &sto.avp_value, &sto.state); - } + if(traced_user_avp.n != 0) + sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, + &sto.avp_value, &sto.state); if((sto.avp == NULL) && trace_is_off(msg)) { LM_DBG("trace off...\n"); @@ -1318,16 +1333,11 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) if(sip_trace_prepare(msg) < 0) return; - if (unlikely(type == TMCB_E2ECANCEL_IN)) { - sto.body.s = msg->buf; - sto.body.len = msg->len; + if(ps->send_buf.len > 0) { + sto.body = ps->send_buf; } else { - if(ps->send_buf.len > 0) { - sto.body = ps->send_buf; - } else { - sto.body.s = "No request buffer"; - sto.body.len = sizeof("No request buffer") - 1; - } + sto.body.s = "No request buffer"; + sto.body.len = sizeof("No request buffer") - 1; } sto.callid = msg->callid->body; @@ -1866,7 +1876,7 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int dlg_tra return; } - if(tmb.register_tmcb(msg, 0, TMCB_E2ECANCEL_IN, trace_onreq_out, info, 0) <= 0) { + if(tmb.register_tmcb(msg, 0, TMCB_E2ECANCEL_IN, trace_cancel_in, info, 0) <= 0) { LM_ERR("can't register trace_onreply_in\n"); return; }

4 years

git:master:b64b3f03: siptrace: don't check if trace is off in ack for negative replies callback

by Federico Cabiddu

Module: kamailio Branch: master Commit: b64b3f03a9c6b69587ca360465f091f873f7274b URL: https://github.com/kamailio/kamailio/commit/b64b3f03a9c6b69587ca360465f091f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-03T10:00:53+02:00 siptrace: don't check if trace is off in ack for negative replies callback --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/b64b3f03a9c6b69587ca360465f091f… Patch: https://github.com/kamailio/kamailio/commit/b64b3f03a9c6b69587ca360465f091f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index c27a9eadba..b000d1ac8d 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1658,10 +1658,6 @@ static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps return; } - if(trace_is_off(ps->req)) { - LM_DBG("trace off...\n"); - return; - } sip_trace(ps->req, (info->uriState == STRACE_PARSED_URI) ? &info->u.dest_info : NULL, NULL, NULL);

4 years

Errored: kamailio/kamailio#8657 (5.3 - 54520ce)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #8657 Status: Errored Duration: 5 mins and 6 secs Commit: 54520ce (5.3) Author: Daniel-Constantin Mierla Message: dialog: keep route block index as signed int - otherwise it can be broken value when route block doesn't exit and kemi callback should be executed - reported by David Escartin (cherry picked from commit 6c557efc1b9cb8c880a05235c94780bbaf305073) View the changeset: https://github.com/kamailio/kamailio/compare/46ad9e6dacb7...54520cee9f6f View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/671581621?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

4 years

git:5.3:54520cee: dialog: keep route block index as signed int

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 54520cee9f6f088ddcfad0e7e6f312c04322bf76 URL: https://github.com/kamailio/kamailio/commit/54520cee9f6f088ddcfad0e7e6f312c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-06T13:18:59+02:00 dialog: keep route block index as signed int - otherwise it can be broken value when route block doesn't exit and kemi callback should be executed - reported by David Escartin (cherry picked from commit 6c557efc1b9cb8c880a05235c94780bbaf305073) --- Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/54520cee9f6f088ddcfad0e7e6f312c… Patch: https://github.com/kamailio/kamailio/commit/54520cee9f6f088ddcfad0e7e6f312c… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index a2f4fa7f97..ed5cd7bef0 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -114,7 +114,7 @@ typedef struct dlg_cell unsigned int dflags; /*!< internal dialog memory flags */ unsigned int iflags; /*!< internal dialog persistent flags */ unsigned int sflags; /*!< script dialog persistent flags */ - unsigned int toroute; /*!< index of route that is executed on timeout */ + int toroute; /*!< index of route that is executed on timeout */ str toroute_name; /*!< name of route that is executed on timeout */ unsigned int from_rr_nb; /*!< information from record routing */ struct dlg_tl tl; /*!< dialog timer list */ diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 0a9ef65246..fa9eae9d1f 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -478,8 +478,8 @@ int pv_get_dlg_ctx(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, (unsigned int)_dlg_ctx.dir); case 7: - return pv_get_uintval(msg, param, res, - (unsigned int)_dlg_ctx.to_route); + return pv_get_sintval(msg, param, res, + _dlg_ctx.to_route); default: return pv_get_uintval(msg, param, res, (unsigned int)_dlg_ctx.on); @@ -601,6 +601,7 @@ int pv_get_dlg(struct sip_msg *msg, pv_param_t *param, int res_type = 0; str sv = { 0 }; unsigned int ui = 0; + int si = 0; if(param==NULL) return -1; @@ -683,8 +684,8 @@ int pv_get_dlg(struct sip_msg *msg, pv_param_t *param, sv.s[sv.len] = '\0'; break; case 9: - res_type = 1; - ui = (unsigned int)dlg->toroute; + res_type = 3; + si = dlg->toroute; break; case 10: if(dlg->cseq[DLG_CALLEE_LEG].s==NULL @@ -817,6 +818,8 @@ int pv_get_dlg(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, ui); case 2: return pv_get_strval(msg, param, res, &sv); + case 3: + return pv_get_sintval(msg, param, res, si); default: return pv_get_null(msg, param, res); }

4 years

git:master:b9b08d78: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b9b08d7883308287b44336bcbc7003368f77d9d2 URL: https://github.com/kamailio/kamailio/commit/b9b08d7883308287b44336bcbc70033… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-05T15:16:08+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/b9b08d7883308287b44336bcbc70033… Patch: https://github.com/kamailio/kamailio/commit/b9b08d7883308287b44336bcbc70033…

4 years

git:master:d08d27bc: dispatcher: added missing ending tag for para

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d08d27bc12ffd2c519094c84f088b6bbb268e356 URL: https://github.com/kamailio/kamailio/commit/d08d27bc12ffd2c519094c84f088b6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T15:04:17+02:00 dispatcher: added missing ending tag for para --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d08d27bc12ffd2c519094c84f088b6b… Patch: https://github.com/kamailio/kamailio/commit/d08d27bc12ffd2c519094c84f088b6b… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 271ec83158..ae8102b355 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -891,7 +891,7 @@ DEST: { </emphasis> </para> <para>If parameter "ds_default_sockname" is set, then this parameter - is ignored.</para>. + is ignored.</para> <example> <title>Set the <quote>ds_default_socket</quote> parameter</title> <programlisting format="linespecific"> @@ -915,7 +915,7 @@ DEST: { </emphasis> </para> <para>This parameter is used even if "ds_default_socket" parameter is set - (this parameter has higher priority). + (this parameter has higher priority).</para> <example> <title>Set the <quote>ds_default_sockname</quote> parameter</title> <programlisting format="linespecific">

4 years

git:master:8619b4c7: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 8619b4c7a1ac4ba245c2c839dd61a107819a6e34 URL: https://github.com/kamailio/kamailio/commit/8619b4c7a1ac4ba245c2c839dd61a10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-05T14:46:09+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/8619b4c7a1ac4ba245c2c839dd61a10… Patch: https://github.com/kamailio/kamailio/commit/8619b4c7a1ac4ba245c2c839dd61a10…

4 years

git:master:71ab3514: dispatcher: docs for sockname attribute for destination records

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 71ab351492835ded235f98d310c7085bb3195fc4 URL: https://github.com/kamailio/kamailio/commit/71ab351492835ded235f98d310c7085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T14:41:15+02:00 dispatcher: docs for sockname attribute for destination records --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/71ab351492835ded235f98d310c7085… Patch: https://github.com/kamailio/kamailio/commit/71ab351492835ded235f98d310c7085… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index d9abd0e556..271ec83158 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -369,6 +369,10 @@ modparam("dispatcher", "force_dst", 1) (value 2). </listitem> <listitem> + sockname - the sockname string - it is added only if xavp_dst_mode has bit 3 set + (value 3). + </listitem> + <listitem> dstid - the destination unique id (in case of call load distribution algorithm). </listitem> <listitem> @@ -1311,6 +1315,7 @@ DEST: { WEIGHT: 50 RWEIGHT: 50 SOCKET: + SOCKNAME: } LATENCY: { AVG: 20.104000 @@ -2041,6 +2046,11 @@ DEST: { It is used for sending the SIP traffic as well as OPTIONS keepalives. </listitem> + <listitem> + 'sockname' - used to set by name the sending socket for the + gateway. It is used for sending the SIP traffic as well as + OPTIONS keepalives and has priority over 'socket' attribute. + </listitem> <listitem> 'ping_from' - used to set the From URI in OPTIONS keepalives. It overwrites the general ds_ping_from parameter.

4 years

git:master:80930085: dispatcher: support for per destination address socket name attribute

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 80930085504a052e450e55eb44a31eb73411f656 URL: https://github.com/kamailio/kamailio/commit/80930085504a052e450e55eb44a31eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T14:35:40+02:00 dispatcher: support for per destination address socket name attribute - attribute name is: sockname - if set to a socket name, enforce the send socket per destination address --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/80930085504a052e450e55eb44a31eb… Patch: https://github.com/kamailio/kamailio/commit/80930085504a052e450e55eb44a31eb…

4 years

git:master:db042d25: tm: local uac support for using socket names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: db042d2579c1eff50c322bbedbb73333d4f2bd06 URL: https://github.com/kamailio/kamailio/commit/db042d2579c1eff50c322bbedbb7333… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T10:58:31+02:00 tm: local uac support for using socket names --- Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/db042d2579c1eff50c322bbedbb7333… Patch: https://github.com/kamailio/kamailio/commit/db042d2579c1eff50c322bbedbb7333… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 1112d7758c..faa7e0df70 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -503,10 +503,12 @@ static inline int t_uac_prepare(uac_req_t *uac_r, request->flags |= nhtype; #ifdef SO_REUSEPORT - if (cfg_get(tcp, tcp_cfg, reuse_port) && - uac_r->ssock!=NULL && uac_r->ssock->len>0 && - request->dst.send_sock->proto == PROTO_TCP) { - request->dst.send_flags.f |= SND_F_FORCE_SOCKET; + if (cfg_get(tcp, tcp_cfg, reuse_port) + && request->dst.send_sock->proto == PROTO_TCP) { + if((uac_r->ssockname!=NULL && uac_r->ssockname->len>0) + || (uac_r->ssock!=NULL && uac_r->ssock->len>0)) { + request->dst.send_flags.f |= SND_F_FORCE_SOCKET; + } } #endif @@ -922,10 +924,14 @@ int req_within(uac_req_t *uac_r) goto err; } - if(uac_r->ssock!=NULL && uac_r->ssock->len>0 - && uac_r->dialog->send_sock==NULL) { - /* set local send socket */ - uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + if(uac_r->dialog->send_sock==NULL) { + if(uac_r->ssockname!=NULL && uac_r->ssockname->len>0) { + /* set local send socket by name */ + uac_r->dialog->send_sock = ksr_get_socket_by_name(uac_r->ssockname); + } else if(uac_r->ssock!=NULL && uac_r->ssock->len>0) { + /* set local send socket by address */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } } /* handle alias parameter in uri @@ -1002,10 +1008,14 @@ int req_outside(uac_req_t *uac_r, str* ruri, str* to, str* from, str *next_hop) if (next_hop) uac_r->dialog->dst_uri = *next_hop; w_calculate_hooks(uac_r->dialog); - if(uac_r->ssock!=NULL && uac_r->ssock->len>0 - && uac_r->dialog->send_sock==NULL) { - /* set local send socket */ - uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + if(uac_r->dialog->send_sock==NULL) { + if(uac_r->ssockname!=NULL && uac_r->ssockname->len>0) { + /* set local send socket by name */ + uac_r->dialog->send_sock = ksr_get_socket_by_name(uac_r->ssockname); + } else if(uac_r->ssock!=NULL && uac_r->ssock->len>0) { + /* set local send socket by address */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } } return t_uac(uac_r); @@ -1062,10 +1072,14 @@ int request(uac_req_t *uac_r, str* ruri, str* to, str* from, str *next_hop) */ uac_r->dialog = dialog; - if(uac_r->ssock!=NULL && uac_r->ssock->len>0 - && uac_r->dialog->send_sock==NULL) { - /* set local send socket */ - uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + if(uac_r->dialog->send_sock==NULL) { + if(uac_r->ssockname!=NULL && uac_r->ssockname->len>0) { + /* set local send socket by name */ + uac_r->dialog->send_sock = ksr_get_socket_by_name(uac_r->ssockname); + } else if(uac_r->ssock!=NULL && uac_r->ssock->len>0) { + /* set local send socket by address */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } } res = t_uac(uac_r); diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 0801fa5b5f..3b9bd64a28 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -44,6 +44,7 @@ typedef struct uac_req { str *headers; str *body; str *ssock; + str *ssockname; dlg_t *dialog; int cb_flags; transaction_cb *cb;

4 years

← Newer
1
...
35
36
37
38
39
40
41
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020