sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

[kamailio/kamailio] Feature request: Wanted support of Content-ID in append_body_part (#1632)

by sergey-safarov

### Description According [RFC6442](https://tools.ietf.org/html/rfc6442#section-5.1) multipart body may contain payload with `Content-ID` header. Now `append_body_part` support only `Content-Disposition` optional header and not supports `Content-ID`. Wanted `Content-ID` to implement RFC6442 -- 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/1632

6 years, 3 months

git:master:64097569: textops: docs - note about how to add additional headers for a body part

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64097569eccad8185117255a6018a32615c9945d URL: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T08:40:01+02:00 textops: docs - note about how to add additional headers for a body part - GH #1632 --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… Patch: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index cfcca4daf6..8e0f350056 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1694,7 +1694,7 @@ text <title><function>append_body_part</function> usage</title> <programlisting format="linespecific"> ... -$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" +$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); ... @@ -1706,6 +1706,31 @@ Content-Disposition: signal;handling=required 7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c +--unique-boundary-1 +... +</programlisting> + </example> + <para> + If other headers are wanted to be added for a body part, they can be + appended after the value of the content-type parameter, separated by + `\r\n` (at the very end do not add the '\r\n'). + </para> + <example> + <title><function>append_body_part</function> with headers</title> + <programlisting format="linespecific"> +... +$var(b) = "<info>active</info>"; +append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +... + +# Will append this to the body: + +... +Content-Type: application/vnd.cirpack.isdn-ext +Content-Disposition: signal;handling=required + +7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c + --unique-boundary-1 ... </programlisting> @@ -1767,6 +1792,10 @@ kamailio ... </programlisting> </example> + <para> + If other headers are wanted to be added for a body part, see the docs + for append_body_part(...) function. + </para> </section> <section id="textops.f.get_body_part">

6 years, 3 months

[kamailio/kamailio] jsonrpc reply error (#1640)

by juha-h

When I execute pua.publish over jsonrpc using pretty new Kamailio master: ```` # T 2018/09/11 18:19:03.550376 127.0.0.1:44190 -> 127.0.0.1:6060 [AP] POST /RPC HTTP/1.1. Host: 127.0.0.1:6060. Accept: */*. Content-Type: application/json. Content-Length: 339. .. {"jsonrpc":"2.0","method":"pua.publish","params":[...],"id":1} # T 2018/09/11 18:19:03.551735 127.0.0.1:5070 -> 127.0.0.1:5080 [AP] PUBLISH sip:test@test.tutpro.com SIP/2.0. ... # T 2018/09/11 18:19:03.553158 127.0.0.1:5080 -> 127.0.0.1:5070 [AP] SIP/2.0 200 OK. ... CSeq: 10 PUBLISH. # T 2018/09/11 18:19:03.556790 127.0.0.1:6060 -> 127.0.0.1:44190 [AP] HTTP/1.1 200 OK. Sia: SIP/2.0/TCP 127.0.0.1:44190. Content-Type: application/json. Server: OpenSIPg SIP Proxy (5.2.0-0b02 (x86_64/linux)). Content-Length: 48. .. { ."jsonrpc":."2.0", ."result":.{ .}, ."id":.1 } ```` I get error at reply: ```` Sep 11 18:19:03 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context Sep 11 18:19:03 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context ```` -- 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/1640

6 years, 3 months

git:master:1db7dc4d: jsonrpcs: set global active context to delayed value for async commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1db7dc4de6588131b4340390b5996141940b7ef0 URL: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T23:12:02+02:00 jsonrpcs: set global active context to delayed value for async commands - GH #1640 --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… Patch: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 5c558c60c4..1fd737298a 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -120,7 +120,8 @@ extern int jsonrpc_dgram_destroy(void); * being currently processed. * @sa rpc_ctx */ -static jsonrpc_ctx_t _jsonrpc_ctx; +static jsonrpc_ctx_t _jsonrpc_ctx_global; +static jsonrpc_ctx_t *_jsonrpc_ctx_active = NULL; static xhttp_api_t xhttp_api; @@ -277,6 +278,7 @@ static int jsonrpc_delayed_reply_ctx_init(jsonrpc_ctx_t* ctx) if (jsonrpc_init_reply(ctx) < 0) return -1; jsonrpc_reset_plain_reply(ctx->jrpl->free_fn); + _jsonrpc_ctx_active = ctx; } return 0; } @@ -773,10 +775,10 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) } isobject = (jnode->type==srjson_Object); - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -844,10 +846,10 @@ static int jsonrpc_array_add(srjson_t *jnode, char* fmt, ...) return -1; } - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -905,10 +907,10 @@ static int jsonrpc_struct_printf(srjson_t *jnode, char* mname, char* fmt, ...) return -1; } - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -1100,6 +1102,7 @@ static void jsonrpc_delayed_ctx_close(struct rpc_delayed_ctx* dctx) r_ctx->msg=0; dctx->reply_ctx=0; shm_free(dctx); + _jsonrpc_ctx_active = NULL; return; } @@ -1233,7 +1236,8 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) } /* initialize jsonrpc context */ - ctx = &_jsonrpc_ctx; + _jsonrpc_ctx_active = &_jsonrpc_ctx_global; + ctx = _jsonrpc_ctx_active; memset(ctx, 0, sizeof(jsonrpc_ctx_t)); ctx->msg = msg; /* parse the jsonrpc request */ @@ -1312,7 +1316,8 @@ int jsonrpc_exec_ex(str *cmd, str *rpath) scmd = *cmd; /* initialize jsonrpc context */ - ctx = &_jsonrpc_ctx; + _jsonrpc_ctx_active = &_jsonrpc_ctx_global; + ctx = _jsonrpc_ctx_active; memset(ctx, 0, sizeof(jsonrpc_ctx_t)); ctx->msg = NULL; /* mark it not send a reply out */ /* parse the jsonrpc request */

6 years, 3 months

git:master:1501e20b: jsonrpcs: print flags in error message when rpc reply is not initialized

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1501e20b65f63c64a89b84196dc925cef79b7c76 URL: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T20:31:07+02:00 jsonrpcs: print flags in error message when rpc reply is not initialized --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… Patch: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 11857fe11e..5c558c60c4 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -775,7 +775,8 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; } @@ -845,7 +846,8 @@ static int jsonrpc_array_add(srjson_t *jnode, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; } @@ -905,7 +907,8 @@ static int jsonrpc_struct_printf(srjson_t *jnode, char* mname, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; }

6 years, 3 months

[kamailio/kamailio] Unable to change tls connection_timeout via kamcmd (#1639)

by arkadiam

### Description Following tls module documentation I'm trying to change connection_timeout value: ``` # kamcmd cfg.set_now_int tls connection_timeout 300 error: 400 - Failed to set the variable ```  ### Troubleshooting #### Log Messages  ``` Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: DEBUG: ctl [io_listener.c:442]: handle_new_connect(): handle_stream read: new connection (1) on /var/run/kamailio//kamailio_ctl Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: ERROR: <core> [core/cfg/cfg_ctx.c:386]: cfg_set_now(): ERROR: cfg_set_now(): integer value is out of range Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: ERROR: <core> [core/cfg/cfg_ctx.c:653]: cfg_set_now(): ERROR: cfg_set_now(): failed to set the variable: tls.connection_timeout Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: DEBUG: ctl [io_listener.c:495]: handle_stream_read(): handle_stream read: eof on /var/run/kamailio//kamailio_ctl ``` ### Possible Solutions Workaround: restart kamailio instead of trying to change variable of the running instance.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.7 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` * **Operating System**:  ``` Linux sip02 4.4.0-134-generic #160-Ubuntu SMP Wed Aug 15 14:58:00 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1639

6 years, 3 months

git:master:deb2904d: tls: proper upper limit for tls connection lifetime

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: deb2904d73a7a540f8eb6e2e8722185b7f0a9a99 URL: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T16:50:25+02:00 tls: proper upper limit for tls connection lifetime - GH #1639 --- Modified: src/modules/tls/tls_cfg.h --- Diff: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… Patch: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… --- diff --git a/src/modules/tls/tls_cfg.h b/src/modules/tls/tls_cfg.h index b4427dda3e..ae404e14bc 100644 --- a/src/modules/tls/tls_cfg.h +++ b/src/modules/tls/tls_cfg.h @@ -34,8 +34,7 @@ /* maximum accepted lifetime (maximum possible is ~ MAXINT/2) * (it should be kept in sync w/ MAX_TCP_CON_LIFETIME from tcp_main.c: * MAX_TLS_CON_LIFETIME <= MAX_TCP_CON_LIFETIME )*/ -#define MAX_TLS_CON_LIFETIME (1U<<(sizeof(ticks_t)*8-1)) - +#define MAX_TLS_CON_LIFETIME ((1U<<(sizeof(ticks_t)*8-1))-1) struct cfg_group_tls {

6 years, 3 months

git:master:bc41d0bc: dialog: update active and early dialogs stats for dmq operations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bc41d0bc75f1b41f0185eeed37d5514525ef27be URL: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T16:41:55+02:00 dialog: update active and early dialogs stats for dmq operations - related to GH #1591 --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… Patch: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 0cfd8a522e..08dbc84686 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -38,6 +38,7 @@ dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; int dmq_send_all_dlgs(dmq_node_t* dmq_node); int dlg_dmq_request_sync(); +extern int dlg_enable_stats; /** * @brief add notification peer @@ -113,6 +114,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no unsigned int init_ts = 0, start_ts = 0, lifetime = 0; unsigned int state = 1; srjson_t *vj; + int newdlg = 0; /* received dmq message */ LM_DBG("dmq message received\n"); @@ -246,6 +248,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no /* prevent DB sync */ dlg->dflags &= ~(DLG_FLAG_NEW|DLG_FLAG_CHANGED); dlg->iflags |= DLG_IFLAG_DMQ_SYNC; + newdlg = 1; } else { /* remove existing profiles */ if (dlg->profile_links!=NULL) { @@ -341,6 +344,13 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg_unref(dlg, unref); goto error; } + if(newdlg==1) { + if (state==DLG_STATE_CONFIRMED_NA || state==DLG_STATE_CONFIRMED) { + if_update_stat(dlg_enable_stats, active_dlgs, 1); + } else if (dlg->state==DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, 1); + } + } dlg->state = state; break; @@ -363,6 +373,11 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg, dlg->h_entry, dlg->h_id); } } + if (state==DLG_STATE_CONFIRMED_NA || state==DLG_STATE_CONFIRMED) { + if_update_stat(dlg_enable_stats, active_dlgs, -1); + } else if (dlg->state==DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, -1); + } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC;

6 years, 3 months

git:master:83adc896: htable: export sht_sets() and sht_seti() to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 83adc8963ef2fa324297beb70ca295a871931c95 URL: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T12:34:36+02:00 htable: export sht_sets() and sht_seti() to kemi framework --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… Patch: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 04c4bb7c9a..61b9e8896a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -912,6 +912,70 @@ int ht_param(modparam_t type, void *val) } +/** + * + */ +static int ki_ht_sets(sip_msg_t *msg, str *htname, str *itname, str *itval) +{ + int_str isvalue; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + isvalue.s = *itval; + + if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, AVP_VAL_STR, &isvalue, 1)!=0) { + LM_ERR("dmq relication failed\n"); + } + + if(ht_set_cell(ht, itname, AVP_VAL_STR, &isvalue, 1)!=0) { + LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + return -1; + } + + return 1; +} + +/** + * + */ +static int ki_ht_seti(sip_msg_t *msg, str *htname, str *itname, int itval) +{ + int_str isvalue; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + isvalue.n = itval; + + if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, 0, &isvalue, 1)!=0) { + LM_ERR("dmq relication failed\n"); + } + + if(ht_set_cell(ht, itname, 0, &isvalue, 1)!=0) { + LM_ERR("cannot set sht: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + return -1; + } + + return 1; +} + #define RPC_DATE_BUF_LEN 21 static const char* htable_dump_doc[2] = { @@ -1484,6 +1548,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_sets"), + SR_KEMIP_INT, ki_ht_sets, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_seti"), + SR_KEMIP_INT, ki_ht_seti, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

6 years, 3 months

git:master:35dec4c2: tm: set uas rb type along with the buffer when relaying replies

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 35dec4c20d78f49ba242229c877894d70c94705c URL: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T19:38:34+02:00 tm: set uas rb type along with the buffer when relaying replies - ensure it is same reply code used in outgoing buffer --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… Patch: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 62e844a55a..88ec5dd629 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1795,7 +1795,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=0; relayed_msg=0; relayed_code=0; - totag_retr=0; /* remember, what was sent upstream to know whether we are @@ -1808,16 +1807,15 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, branch, save_clone, relay, t->uac[branch].icode, msg_status); /* store the message if needed */ - if (save_clone) /* save for later use, typically branch picking */ - { + if (save_clone) { + /* save for later use, typically branch picking */ if (!store_reply( t, branch, p_msg )) goto error01; } - uas_rb = & t->uas.response; + /* initialize for outbound reply */ + uas_rb = &t->uas.response; if (relay >= 0 ) { - /* initialize sockets for outbound reply */ - uas_rb->rbtype=msg_status; /* only messages known to be relayed immediately will be * be called on; we do not evoke this callback on messages * stored in shmem -- they are fixed and one cannot change them @@ -1829,12 +1827,11 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, } /* try building the outbound reply from either the current * or a stored message */ - relayed_msg = branch==relay ? p_msg : t->uac[relay].reply; + relayed_msg = (branch==relay) ? p_msg : t->uac[relay].reply; if (relayed_msg==FAKED_REPLY) { if(t->flags & T_CANCELED) { /* transaction canceled - send 487 */ relayed_code = 487; - uas_rb->rbtype = 487; } else { relayed_code = (branch==relay) ? msg_status : t->uac[relay].last_received; @@ -1889,7 +1886,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=build_res_buf_from_sip_req(500, &reason, to_tag, t->uas.request, &res_len, &bm); relayed_code=500; - uas_rb->rbtype = 500; }else if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (relayed_code==401 || relayed_code==407) && (auth_reply_count(t, p_msg)>1)){ @@ -1944,6 +1940,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, LM_ERR("cannot alloc reply shmem\n"); goto error03; } + uas_rb->rbtype = relayed_code; uas_rb->buffer_len = res_len; memcpy( uas_rb->buffer, buf, res_len ); if (relayed_msg==FAKED_REPLY) { /* to-tags for local replies */ @@ -1956,13 +1953,13 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, t->relayed_reply_branch = relay; if ( unlikely(is_invite(t) && relayed_msg!=FAKED_REPLY - && relayed_code>=200 && relayed_code < 300 - && has_tran_tmcbs( t, - TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY - |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN))) { + && relayed_code>=200 && relayed_code < 300 + && has_tran_tmcbs( t, + TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY + |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN))) { totag_retr=update_totag_set(t, relayed_msg); } - }; /* if relay ... */ + } /* if relay ... */ UNLOCK_REPLIES( t );

6 years, 3 months

← Newer
1
...
22
23
24
25
26
27
28
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018