sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:0ea62995: tm: typedefs renamed to match better module and common pattern
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 0ea62995ab026737411f3106a4584ba4ba640426 URL: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T17:22:54+02:00 tm: typedefs renamed to match better module and common pattern - were not used so far --- Modified: src/modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… Patch: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 7aca7ed92c..bfcd28f2ca 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -162,7 +162,7 @@ typedef struct retr_buf struct dest_info dst; ticks_t retr_expire; ticks_t fr_expire; /* ticks value after which fr. will fire */ -} retr_buf_type; +} tm_retr_buf_t; /* User Agent Server content */ @@ -181,7 +181,7 @@ typedef struct ua_server * for e2e cancels */ #endif /* CANCEL_REASON_SUPPORT */ unsigned int status; -} ua_server_type; +} tm_ua_server_t; /* User Agent Client content */ @@ -244,15 +244,15 @@ typedef struct ua_client unsigned short on_reply; /* unused - keep the structure aligned to 32b */ unsigned short on_unused; -} ua_client_type; +} tm_ua_client_t; -struct totag_elem +typedef struct totag_elem { struct totag_elem *next; str tag; volatile int acked; -}; +} tm_totag_elem_t; /* structure for storing transaction state prior to suspending * of async transactions */ @@ -262,7 +262,7 @@ typedef struct async_state unsigned int backup_branch; unsigned int blind_uac; unsigned int ruri_new; -} async_state_type; +} tm_async_state_t; /* transaction's flags */ /* is the transaction's request an INVITE? */ @@ -506,7 +506,7 @@ typedef struct entry unsigned long cur_entries; #endif char _pad[ENTRY_PAD_BYTES]; -} entry_type; +} tm_entry_t; /* transaction table */

1 0

git:master:1aad02ed: tm: activ_type field renamed to rbtype in struct retr_buf
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 1aad02edc6b9ffb104900cbc624f0853166ae926 URL: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T17:15:30+02:00 tm: activ_type field renamed to rbtype in struct retr_buf - better matching the purpose and do not use a typo word - field t_active changed from char to short for better mem align --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085… Patch: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085…

1 0

git:master:5b223a2e: tm: update uas rb activ_type when overwriting realyed_code
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 5b223a2e8a92f351b8eab756f5256fda7645ff21 URL: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T15:03:44+02:00 tm: update uas rb activ_type when overwriting realyed_code - otherwise could end up skipping the execution for TMCB_RESPONSE_OUT tm callback, affecting acc, ... --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… Patch: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 271932c90c..14f244ef7d 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1795,6 +1795,7 @@ 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 @@ -1803,8 +1804,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* *** store and relay message as needed *** */ reply_status = t_should_relay_response(t, msg_status, branch, &save_clone, &relay, cancel_data, p_msg ); - LM_DBG("branch=%d, save=%d, relay=%d icode=%d\n", - branch, save_clone, relay, t->uac[branch].icode); + LM_DBG("branch=%d, save=%d, relay=%d icode=%d msg status=%u\n", + 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 */ @@ -1833,8 +1834,9 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if(t->flags & T_CANCELED) { /* transaction canceled - send 487 */ relayed_code = 487; + uas_rb->activ_type = 487; } else { - relayed_code = branch==relay + relayed_code = (branch==relay) ? msg_status : t->uac[relay].last_received; } /* use to_tag from the original request, or if not present, @@ -1887,6 +1889,7 @@ 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->activ_type = 500; }else if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (relayed_code==401 || relayed_code==407) && (auth_reply_count(t, p_msg)>1)){ @@ -2003,6 +2006,10 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if(relayed_code==uas_rb->activ_type) { run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, t->uas.request, relayed_msg, TMCB_NONE_F); + } else { + LM_DBG("skip tm callback %d - relay code %d active %d\n", + TMCB_RESPONSE_OUT, relayed_code, + uas_rb->activ_type); } UNLOCK_REPLIES( t ); }

1 0

git:master:f21554c6: acc: more debug message when checking if acc should be done
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: f21554c6befaddbc82016d5d498e11ab3720c404 URL: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T09:18:27+02:00 acc: more debug message when checking if acc should be done --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… Patch: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index d41108d3bc..e0443ce906 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -411,27 +411,40 @@ static inline int should_acc_reply(struct sip_msg *req, struct sip_msg *rpl, { unsigned int i; + LM_DBG("probing acc state - code: %d flags: 0x%x\n", code, + (req)?req->flags:0); /* negative transactions reported otherwise only if explicitly * demanded */ - if (code >= 300) { - if (!is_failed_acc_on(req)) return 0; + if (!is_failed_acc_on(req)) { + LM_DBG("failed acc is off\n"); + return 0; + } i = 0; while (failed_filter[i] != 0) { - if (failed_filter[i] == code) return 0; + if (failed_filter[i] == code) { + LM_DBG("acc code in filter: %d\n", code); + return 0; + } i++; } + LM_DBG("failed acc is on\n"); return 1; } - if ( !is_acc_on(req) ) + if ( !is_acc_on(req) ) { + LM_DBG("acc is off\n"); return 0; + } if ( code<200 && !(early_media && parse_headers(rpl,HDR_CONTENTLENGTH_F, 0) == 0 && - rpl->content_length && get_content_length(rpl) > 0)) + rpl->content_length && get_content_length(rpl) > 0)) { + LM_DBG("early media acc is off\n"); return 0; + } + LM_DBG("acc is on\n"); return 1; /* seed is through, we will account this reply */ } @@ -461,6 +474,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, int flags_to_reset = 0; int br = -1; + LM_DBG("preparing to report the record\n"); /* get winning branch index, if set */ if (t->relayed_reply_branch>=0) { br = t->relayed_reply_branch;

1 0

jsonrpc reply error
by Juha Heinanen 10 Sep '18

10 Sep '18

When I execute pua.publish over jsonrpc, I get error at reply: Sep 10 09:37:34 char /usr/bin/sip-proxy[11104]: INFO: Executing JSON request <{"jsonrpc":"2.0","method":"pua.publish","params":[...],"id":1}> Sep 10 09:37:34 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context This is with pretty new master. -- Juha

1 0

git:master:75040f62: rtpengine: safety check for tm uas.request field
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 75040f62238d6181dc9aec977588c63d15dc5cbc URL: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:19:02+02:00 rtpengine: safety check for tm uas.request field --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… Patch: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 4187e61a84..e576117c35 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3310,6 +3310,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) { int method; int nosdp; + tm_cell_t *t = NULL; if (msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || (msg->cseq==NULL))) @@ -3339,9 +3340,12 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) return rtpengine_offer_answer(msg, flags, OP_OFFER, 0); if(method==METHOD_INVITE && nosdp==0) { msg->msg_flags |= FL_SDP_BODY; - if(tmb.t_gett!=NULL && tmb.t_gett()!=NULL - && tmb.t_gett()!=T_UNDEFINED) - tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; + if(tmb.t_gett!=NULL) { + t = tmb.t_gett(); + if(t!=NULL && t!=T_UNDEFINED && t->uas.request!=NULL) { + t->uas.request->msg_flags |= FL_SDP_BODY; + } + } if(route_type==FAILURE_ROUTE) return rtpengine_delete(msg, flags); return rtpengine_offer_answer(msg, flags, OP_OFFER, 0);

1 0

git:master:ac65216b: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: ac65216b26449c05e27aaf772ade75477128a7d7 URL: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-09T15:32:03+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754… Patch: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754…

1 0

git:master:40518b64: htable: docs for sht_rm(htname, itname)
by Daniel-Constantin Mierla 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: 40518b640f1811dd65196bd08e0460dff4e7040a URL: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-09T09:01:11+02:00 htable: docs for sht_rm(htname, itname) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… Patch: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 6a8492a94e..e67e7cc74b 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -749,6 +749,26 @@ modparam("htable", "event_callback_mode", 1) ... sht_print(); ... +</programlisting> + </example> + </section> + <section id="htable.f.sht_rm"> + <title> + <function moreinfo="none">sht_rm(htname, itname)</function> + </title> + <para> + Delete the item with the name 'itname' from hash table 'htname'. + This API function equivaluent to '$sht(htname=>itname) = $null'. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_rm</function> usage</title> + <programlisting format="linespecific"> +... +sht_rm("ha", "test""); +... </programlisting> </example> </section>

1 0

git:master:f5661587: htable: added sht_rm(htname, iname)
by Daniel-Constantin Mierla 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: f5661587f8547bc878965342aa36ce5e462d3e9a URL: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-08T21:29:11+02:00 htable: added sht_rm(htname, iname) - api function to remove an item from hash table --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… Patch: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 214b6e3608..04c4bb7c9a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -66,6 +66,7 @@ static int child_init(int rank); static void destroy(void); static int fixup_ht_key(void** param, int param_no); +static int w_ht_rm(sip_msg_t* msg, char* htname, char* itname); static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo); static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo); static int w_ht_rm_name(struct sip_msg* msg, char* hname, char* op, char *val); @@ -106,7 +107,9 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ - {"sht_print", (cmd_function)ht_print, 0, 0, 0, + {"sht_print", (cmd_function)ht_print, 0, 0, 0, + ANY_ROUTE}, + {"sht_rm", (cmd_function)w_ht_rm, 2, fixup_spve_spve, 0, ANY_ROUTE}, {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_key, 0, ANY_ROUTE}, @@ -543,6 +546,43 @@ static int ki_ht_rm_value(sip_msg_t* msg, str* sname, str* sop, str *sval) return ht_rm_items(msg, sname, sop, sval, 1); } +static int ki_ht_rm(sip_msg_t* msg, str* hname, str* iname) +{ + ht_t *ht; + + ht = ht_get_table(hname); + if(ht==NULL) { + LM_ERR("cannot get hash table [%.*s]\n", hname->len, hname->s); + return -1; + } + + /* delete it */ + if (ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, hname, + iname, 0, NULL, 0)!=0) { + LM_ERR("dmq relication failed\n"); + } + ht_del_cell(ht, iname); + return 1; +} + +static int w_ht_rm(sip_msg_t* msg, char* htname, char* itname) +{ + str shtname; + str sitname; + + if(fixup_get_svalue(msg, (gparam_t*)htname, &shtname)<0 || shtname.len<=0) { + LM_ERR("cannot get the hash table name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)itname, &sitname)<0 || sitname.len<=0) { + LM_ERR("cannot get the item table name\n"); + return -1; + } + + return ki_ht_rm(msg, &shtname, &sitname); +} + static int ht_has_str_items(sip_msg_t* msg, str* hname, str* op, str *val, int mkey) { @@ -1409,6 +1449,11 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_rm"), + SR_KEMIP_INT, ki_ht_rm, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("htable"), str_init("sht_rm_name_re"), SR_KEMIP_INT, ki_ht_rm_name_re, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] [5.1] pkg/kamailio/obs: RPM SPEC update (#1638)
by sergey-safarov 08 Sep '18

08 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1638 -- Commit Summary -- * [5.1] pkg/kamailio/obs: RPM SPEC update -- File Changes -- M pkg/kamailio/obs/kamailio.spec (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1638.patch https://github.com/kamailio/kamailio/pull/1638.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/1638

2 1

← Newer
1
...
23
24
25
26
27
28
29
...
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 September 2018