sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
256 discussions

[kamailio] error while dumping dialog via RPC (#145)
by Savolainen Dmitri 01 May '18

01 May '18

In part of profiles and/or variables section while using `static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, int with_context) ` May be it is an error of ctl module ``` # kamcmd dlg.list { h_entry: 6718 h_id: 20440 call-id: 48c9fe85f6750163(a)192.168.5.60 from_uri: sip:000*051@xxxxxx.xx:5068 to_uri: sip:002@xxxxxx.xx:5068 state: 4 start_ts: 1430324850 init_ts: 1430324847 timeout: 1430368049 lifetime: 43200 dflags: 515 sflags: 0 iflags: 0 caller: { tag: bda5e24faa4c4ff5 contact: sip:000*051@192.168.5.60:5066;transport=udp;alias=xxx.xxx.78.202~5066~1 cseq: 5457 route_set: socket: udp:xxx.xxx.66.150:5068 } callee: { tag: 4y2gjr7N9231K contact: sip:002@xxx.xxx.66.151:5080;transport=udp cseq: 0 route_set: socket: udp:xxx.xxx.66.150:5068 } profiles: { ERROR while parsing the record 62, @698: 03 : bad record ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/145

4 6

git:master:20b0f29f: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 20b0f29fa489b220d4460d079541d0f045458871 URL: https://github.com/kamailio/kamailio/commit/20b0f29fa489b220d4460d079541d0f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-30T18:01:35+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/20b0f29fa489b220d4460d079541d0f… Patch: https://github.com/kamailio/kamailio/commit/20b0f29fa489b220d4460d079541d0f… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 8260fe194a..f1b236e936 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -88,7 +88,7 @@ Daniel-Constantin Mierla 4.9. t_on_branch(branch_route) 4.10. t_newtran() 4.11. t_reply(code, reason_phrase) - 4.12. t_semd_reply(code, reason) + 4.12. t_send_reply(code, reason) 4.13. t_lookup_request() 4.14. t_retransmit_reply() 4.15. t_release() @@ -332,7 +332,7 @@ Chapter 1. Admin Guide 4.9. t_on_branch(branch_route) 4.10. t_newtran() 4.11. t_reply(code, reason_phrase) - 4.12. t_semd_reply(code, reason) + 4.12. t_send_reply(code, reason) 4.13. t_lookup_request() 4.14. t_retransmit_reply() 4.15. t_release() @@ -1639,7 +1639,7 @@ end 4.9. t_on_branch(branch_route) 4.10. t_newtran() 4.11. t_reply(code, reason_phrase) - 4.12. t_semd_reply(code, reason) + 4.12. t_send_reply(code, reason) 4.13. t_lookup_request() 4.14. t_retransmit_reply() 4.15. t_release() @@ -1913,7 +1913,7 @@ if (t_newtran()) { t_reply("404", "Not found"); ... -4.12. t_semd_reply(code, reason) +4.12. t_send_reply(code, reason) Creates the transaction if it does not exist (executing internally t_newtran()) and sends a stateful reply (executing internally

1 0

git:master:993dd0c8: tm: small spelling fix in docs (semd -> send)
by Henning Westerholt 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 993dd0c808402ade144783d527b7db0e2227987d URL: https://github.com/kamailio/kamailio/commit/993dd0c808402ade144783d527b7db0… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-30T17:47:09+02:00 tm: small spelling fix in docs (semd -> send) --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/993dd0c808402ade144783d527b7db0… Patch: https://github.com/kamailio/kamailio/commit/993dd0c808402ade144783d527b7db0… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index f9a1995e52..67cc5d017c 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -362,7 +362,7 @@ t_reply("404", "Not found"); <section id="tm.f.t_send_reply"> <title> - <function>t_semd_reply(code, reason)</function> + <function>t_send_reply(code, reason)</function> </title> <para> Creates the transaction if it does not exist (executing internally

1 0

git:master:4c9bcb4c: usrloc: renamed global var matching_mode to ul_matching_mode
by Daniel-Constantin Mierla 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 4c9bcb4cce43b3b8f25667d52d0aea98382e7db5 URL: https://github.com/kamailio/kamailio/commit/4c9bcb4cce43b3b8f25667d52d0aea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-30T12:51:07+02:00 usrloc: renamed global var matching_mode to ul_matching_mode - avoid exports conflict with the other usrloc alternative modules --- Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/urecord.c Modified: src/modules/usrloc/usrloc_mod.c Modified: src/modules/usrloc/usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/4c9bcb4cce43b3b8f25667d52d0aea9… Patch: https://github.com/kamailio/kamailio/commit/4c9bcb4cce43b3b8f25667d52d0aea9… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index a43c5c6c00..93b30fab05 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -739,7 +739,7 @@ int db_update_ucontact_addr(ucontact_t* _c) LM_DBG("contact:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); n1++; - switch (matching_mode) { + switch (ul_matching_mode) { case CONTACT_ONLY: /* update call-id */ keys2[nr_cols2] = &callid_col; @@ -796,7 +796,7 @@ int db_update_ucontact_addr(ucontact_t* _c) nr_cols2++; break; default: - LM_CRIT("unknown matching_mode %d\n", matching_mode); + LM_CRIT("unknown matching_mode %d\n", ul_matching_mode); return -1; } @@ -1464,7 +1464,7 @@ int db_delete_ucontact_addr(ucontact_t* _c) vals[n].val.str_val = _c->c; n++; - switch (matching_mode) { + switch (ul_matching_mode) { case CONTACT_ONLY: break; case CONTACT_CALLID: @@ -1486,7 +1486,7 @@ int db_delete_ucontact_addr(ucontact_t* _c) n++; break; default: - LM_CRIT("unknown matching_mode %d\n", matching_mode); + LM_CRIT("unknown matching_mode %d\n", ul_matching_mode); return -1; } diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index 598cbd88fe..279ab2d17c 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -42,7 +42,7 @@ #include "usrloc.h" /*! contact matching mode */ -int matching_mode = CONTACT_ONLY; +int ul_matching_mode = CONTACT_ONLY; /*! retransmission detection interval in seconds */ int cseq_delay = 20; @@ -772,7 +772,7 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, no_callid = 0; *_co = 0; - switch (matching_mode) { + switch (ul_matching_mode) { case CONTACT_ONLY: ptr = contact_match( _r->contacts, _c); break; @@ -787,7 +787,7 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, ptr = contact_match_callidonly( _r->contacts, _callid); break; default: - LM_CRIT("unknown matching_mode %d\n", matching_mode); + LM_CRIT("unknown matching_mode %d\n", ul_matching_mode); return -1; } diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 50eb0cb888..d0f8d22b6f 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -220,7 +220,7 @@ static param_export_t params[] = { {"connection_id_column",PARAM_STR, &con_id_col }, {"keepalive_column", PARAM_STR, &keepalive_col }, {"partition_column", PARAM_STR, &partition_col }, - {"matching_mode", INT_PARAM, &matching_mode }, + {"matching_mode", INT_PARAM, &ul_matching_mode }, {"cseq_delay", INT_PARAM, &cseq_delay }, {"fetch_rows", INT_PARAM, &ul_fetch_rows }, {"hash_size", INT_PARAM, &ul_hash_size }, @@ -308,14 +308,14 @@ static int mod_init(void) ul_hash_size = 1<<ul_hash_size; /* check matching mode */ - switch (matching_mode) { + switch (ul_matching_mode) { case CONTACT_ONLY: case CONTACT_CALLID: case CONTACT_PATH: case CONTACT_CALLID_ONLY: break; default: - LM_ERR("invalid matching mode %d\n", matching_mode); + LM_ERR("invalid matching mode %d\n", ul_matching_mode); } /* Register cache timer */ diff --git a/src/modules/usrloc/usrloc_mod.h b/src/modules/usrloc/usrloc_mod.h index 4b0fa35671..12735f11ee 100644 --- a/src/modules/usrloc/usrloc_mod.h +++ b/src/modules/usrloc/usrloc_mod.h @@ -111,7 +111,7 @@ extern unsigned int ul_db_srvid; #define CONTACT_PATH (2) #define CONTACT_CALLID_ONLY (3) -extern int matching_mode; +extern int ul_matching_mode; extern int ul_db_ops_ruid;

1 0

[kamailio/kamailio] ul.dump with huge amount of AoR's (#1513)
by Victor K 30 Apr '18

30 Apr '18

### Description ul.dump can't work with huge amount of aor (~40K), it fail with 500, "Internal error creating aor struct". And seems it get and not free'd memory, after some calls kamcmd ul.dump / kamcmd ul.dump brief kamailio stop service with messages: ``` Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: <core> [sip_msg_clone.c:498]: sip_msg_shm_clone(): cannot allocate memory Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: dmq [worker.c:164]: add_dmq_job(): error cloning sip message Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: dmq [message.c:67]: dmq_handle_message(): failed to add dmq job Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: <core> [mem/q_malloc.c:292]: qm_find_free(): qm_find_free(0x809132000, 3976); Free fragment not found! Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: <core> [mem/q_malloc.c:425]: qm_malloc(): qm_malloc(0x809132000, 3976) called from core: sip_msg_clone.c: sip_msg_shm_clone(495), module: core; Free fragment not found! ``` ### Possible Solutions Need rewrite ul_rpc_dump() in modules/usrloc/ul_rpc.c to aor-by-aor print. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.0-dev6 (x86_64/freebsd) 9fe51e-dirty 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, FAST_LOCK-ADAPTIVE_WAIT, USE_POSIX_SEM, 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, select, kqueue. id: 9fe51e -dirty compiled on 10:49:57 Nov 18 2016 with cc 3.4 ``` * **Operating System**: ``` FreeBSD kamailio-c2 10.3-STABLE FreeBSD 10.3-STABLE #0 r306194 ``` -- 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/1513

2 2

git:master:aeab281d: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: aeab281d0db468afb3175cf7511ff2d689984bf6 URL: https://github.com/kamailio/kamailio/commit/aeab281d0db468afb3175cf7511ff2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-30T08:31:54+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/aeab281d0db468afb3175cf7511ff2d… Patch: https://github.com/kamailio/kamailio/commit/aeab281d0db468afb3175cf7511ff2d…

1 0

git:master:0ae7e001: tm: docs for t_send_reply()
by Daniel-Constantin Mierla 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 0ae7e00152538819dfe499a74f4de5e6d69ac14f URL: https://github.com/kamailio/kamailio/commit/0ae7e00152538819dfe499a74f4de5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-30T08:19:45+02:00 tm: docs for t_send_reply() --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/0ae7e00152538819dfe499a74f4de5e… Patch: https://github.com/kamailio/kamailio/commit/0ae7e00152538819dfe499a74f4de5e… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index f40b8db0bb..f9a1995e52 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -360,6 +360,40 @@ t_reply("404", "Not found"); </example> </section> + <section id="tm.f.t_send_reply"> + <title> + <function>t_semd_reply(code, reason)</function> + </title> + <para> + Creates the transaction if it does not exist (executing internally + t_newtran()) and sends a stateful reply (executing internally + t_reply()). If transaction exists, this function does not stop the + execution of config, t_reply() being still executed. + </para> + <para> + For more, see the docs for t_newtran() and t_reply(). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>code</emphasis> - Reply code number. + </para> + </listitem> + <listitem> + <para><emphasis>reason</emphasis> - Reason string. + </para> + </listitem> + </itemizedlist> + <example> + <title><function>t_send_reply</function> usage</title> + <programlisting> +... +t_send_reply("404", "Not found"); +... + </programlisting> + </example> + </section> + <section id="tm.f.t_lookup_request"> <title> <function>t_lookup_request()</function>

1 0

git:master:672484e9: tm: added t_send_reply(code, reason)
by Daniel-Constantin Mierla 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 672484e9e0be161f5f9f0b82afc027f4ef8097e4 URL: https://github.com/kamailio/kamailio/commit/672484e9e0be161f5f9f0b82afc027f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-29T07:51:59+02:00 tm: added t_send_reply(code, reason) - create the transaction if it doesn't exist and send a stateful reply --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/672484e9e0be161f5f9f0b82afc027f… Patch: https://github.com/kamailio/kamailio/commit/672484e9e0be161f5f9f0b82afc027f… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 7ec44e8b43..a7977d7003 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -111,6 +111,7 @@ static int child_init(int rank); static int w_t_check(struct sip_msg* msg, char* str, char* str2); static int w_t_lookup_cancel(struct sip_msg* msg, char* str, char* str2); static int w_t_reply(struct sip_msg* msg, char* str, char* str2); +static int w_t_send_reply(struct sip_msg* msg, char* p1, char* p2); static int w_t_release(struct sip_msg* msg, char* str, char* str2); static int w_t_retransmit_reply(struct sip_msg* p_msg, char* foo, char* bar ); static int w_t_newtran(struct sip_msg* p_msg, char* foo, char* bar ); @@ -241,7 +242,9 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE}, {"t_lookup_cancel", w_t_lookup_cancel, 1, fixup_int_1, REQUEST_ROUTE}, - {"t_reply", w_t_reply, 2, fixup_t_reply, + {"t_reply", w_t_reply, 2, fixup_t_reply, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE }, + {"t_send_reply", w_t_send_reply, 2, fixup_t_reply, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE }, {"t_retransmit_reply", w_t_retransmit_reply, 0, 0, REQUEST_ROUTE}, @@ -1390,6 +1393,49 @@ static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) return ki_t_reply(msg, code, &reason); } +/** + * + */ +static int ki_t_send_reply(sip_msg_t* msg, int code, str* reason) +{ + int ret; + + ret = t_newtran(msg); + if (ret==0) { + LM_NOTICE("transaction already in process %p\n", get_t()); + } + + return ki_t_reply(msg, code, reason); +} + +/** + * + */ +static int w_t_send_reply(struct sip_msg* msg, char* p1, char* p2) +{ + int code; + str reason; + + if (msg->REQ_METHOD==METHOD_ACK) { + LM_DBG("ACKs are not replied\n"); + return -1; + } + + if (get_int_fparam(&code, msg, (fparam_t*)p1) < 0) { + code = cfg_get(tm, tm_cfg, default_code); + } + + if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) { + reason.s = cfg_get(tm, tm_cfg, default_reason); + reason.len = strlen(reason.s); + } + + return ki_t_send_reply(msg, code, &reason); +} + +/** + * + */ static int t_release(sip_msg_t* msg) { struct cell *t; @@ -2760,6 +2806,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_send_reply"), + SR_KEMIP_INT, ki_t_send_reply, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_check_trans"), SR_KEMIP_INT, t_check_trans, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] nathelper: it doesn't ping contacts if ping_nated_only=0 (#1515)
by Konstantin 29 Apr '18

29 Apr '18

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description - if ping_nated_only=0, module should send pings to all contacts, but it sends them only in nat flags are specified. We need to test additional condition if ping_nated_only=0 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1515 -- Commit Summary -- * Incorrect date format used to query contacts by expire time. * nathelper: it doesn't ping contacts if ping_nated_only=0 -- File Changes -- M src/modules/nathelper/nathelper.c (7) M src/modules/usrloc/dlist.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1515.patch https://github.com/kamailio/kamailio/pull/1515.diff -- 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/pull/1515

1 1

git:master:a6c3b35d: tm: removed no longer necessary wrapers for kemi t_reply() export
by Daniel-Constantin Mierla 27 Apr '18

27 Apr '18

Module: kamailio Branch: master Commit: a6c3b35dde900c718d8d010b0b8094b384b890d8 URL: https://github.com/kamailio/kamailio/commit/a6c3b35dde900c718d8d010b0b8094b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-27T11:55:10+02:00 tm: removed no longer necessary wrapers for kemi t_reply() export --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/a6c3b35dde900c718d8d010b0b8094b… Patch: https://github.com/kamailio/kamailio/commit/a6c3b35dde900c718d8d010b0b8094b… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 3c27675baf..7ec44e8b43 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1311,7 +1311,10 @@ static int w_t_forward_nonack_to( struct sip_msg *p_msg , return r; } -static int t_reply_helper(sip_msg_t* msg, int code, str* reason) +/** + * + */ +static int ki_t_reply(sip_msg_t* msg, int code, str* reason) { tm_cell_t *t = NULL; int ret = -1; @@ -1320,6 +1323,7 @@ static int t_reply_helper(sip_msg_t* msg, int code, str* reason) LM_DBG("ACKs are not replied\n"); return -1; } + if (t_check( msg , 0 )==-1) return -1; t=get_t(); if (!t) { @@ -1327,23 +1331,24 @@ static int t_reply_helper(sip_msg_t* msg, int code, str* reason) " for which no T-state has been established\n"); return -1; } + /* if called from reply_route, make sure that unsafe version * is called; we are already in a mutex and another mutex in * the safe version would lead to a deadlock */ - t->flags |= T_ADMIN_REPLY; if (is_route_type(FAILURE_ROUTE)) { LM_DBG("t_reply_unsafe called from w_t_reply\n"); - ret = t_reply_str_unsafe(t, msg, code, reason); + ret = t_reply_str_unsafe(t, msg, (unsigned int)code, reason); } else if (is_route_type(REQUEST_ROUTE)) { - ret = t_reply_str( t, msg, code, reason); + ret = t_reply_str( t, msg, (unsigned int)code, reason); } else if (is_route_type(ONREPLY_ROUTE)) { if (likely(t->uas.request)){ if (is_route_type(CORE_ONREPLY_ROUTE)) - ret=t_reply_str(t, t->uas.request, code, reason); + ret=t_reply_str(t, t->uas.request, (unsigned int)code, reason); else - ret=t_reply_str_unsafe(t, t->uas.request, code, reason); + ret=t_reply_str_unsafe(t, t->uas.request, (unsigned int)code, + reason); }else ret=-1; /* t_check() above has the side effect of setting T and @@ -1382,10 +1387,9 @@ static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) reason.len = strlen(reason.s); } - return t_reply_helper(msg, code, &reason); + return ki_t_reply(msg, code, &reason); } - static int t_release(sip_msg_t* msg) { struct cell *t; @@ -2254,24 +2258,6 @@ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) return ki_t_save_lumps(msg); } -/* wrapper function needed after changes in w_t_reply */ -int w_t_reply_wrp(struct sip_msg *m, unsigned int code, char *txt) -{ - fparam_t c; - fparam_t r; - - c.type = FPARAM_INT; - c.orig = NULL; /* ? */ - c.v.i = code; - - r.type = FPARAM_STRING; - r.orig = NULL; /* ? */ - r.v.asciiz = txt; - - return w_t_reply(m, (char *)&c, (char*)&r); -} - - /** script function, check if a msg is assoc. to a transaction. * @return -1 (not), 1 (reply, e2e ack or cancel for an existing transaction), @@ -2740,14 +2726,6 @@ static int ki_t_relay(sip_msg_t *msg) return _w_t_relay_to(msg, (struct proxy_l *)0, PROTO_NONE); } -/** - * - */ -static int ki_t_reply(sip_msg_t *msg, int code, str *reason) -{ - return w_t_reply_wrp(msg, (unsigned int)code, reason->s); -} - /** * */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018