sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

git:master:83758719: siptrace: add trace_flag after it was removed
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 8375871957ce931b87cc03442915fa319b5b3ef6 URL: https://github.com/kamailio/kamailio/commit/8375871957ce931b87cc03442915fa3… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: add trace_flag after it was removed As requested trace_flag is added back to siptrace module. Kamailio users requested ways to be able to stop tracing at any moment during the script. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/8375871957ce931b87cc03442915fa3… Patch: https://github.com/kamailio/kamailio/commit/8375871957ce931b87cc03442915fa3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 2f8f32a11f..9af3b522bf 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -132,6 +132,8 @@ static str siptrace_info_avp_str = str_init("$avp(__siptrace_info_avp__)"); #define NR_KEYS 12 #define SIP_TRACE_TABLE_VERSION 4 +int trace_flag = 0; + int trace_on = 0; int trace_sl_acks = 1; @@ -213,6 +215,7 @@ static param_export_t params[] = { {"fromtag_column", PARAM_STR, &fromtag_column}, {"totag_column", PARAM_STR, &totag_column}, {"direction_column", PARAM_STR, &direction_column}, + {"trace_flag", INT_PARAM, &trace_flag}, {"trace_on", INT_PARAM, &trace_on}, {"traced_user_avp", PARAM_STR, &traced_user_avp_str}, {"trace_table_avp", PARAM_STR, &trace_table_avp_str}, @@ -274,6 +277,12 @@ static int mod_init(void) return -1; } + if(trace_flag < 0 || trace_flag > (int)MAX_FLAG) { + LM_ERR("invalid trace flag %d\n", trace_flag); + return -1; + } + trace_flag = 1 << trace_flag; + trace_to_database_flag = (int *)shm_malloc(sizeof(int)); if(trace_to_database_flag == NULL) { LM_ERR("no more shm memory left\n"); @@ -1122,7 +1131,8 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, } #define trace_is_off(_msg) \ - (((_msg)->msg_flags & FL_SIPTRACE) == 0) + ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \ + || ((_msg->flags & trace_flag) == 0)) static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) { @@ -1529,6 +1539,11 @@ 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); }

1 0

git:master:b40cf0bf: siptrace: update README
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: b40cf0bfd072e733bcde58b4584abb4653d67f1e URL: https://github.com/kamailio/kamailio/commit/b40cf0bfd072e733bcde58b4584abb4… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: update README --- Modified: src/modules/siptrace/README Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b40cf0bfd072e733bcde58b4584abb4… Patch: https://github.com/kamailio/kamailio/commit/b40cf0bfd072e733bcde58b4584abb4…

1 0

git:master:84a358d1: siptrace: remove unused trace flag
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 84a358d143612544136bf34e9d6a369eb7547d4c URL: https://github.com/kamailio/kamailio/commit/84a358d143612544136bf34e9d6a369… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: remove unused trace flag --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/84a358d143612544136bf34e9d6a369… Patch: https://github.com/kamailio/kamailio/commit/84a358d143612544136bf34e9d6a369… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fb6d4180e8..2f8f32a11f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -132,7 +132,6 @@ static str siptrace_info_avp_str = str_init("$avp(__siptrace_info_avp__)"); #define NR_KEYS 12 #define SIP_TRACE_TABLE_VERSION 4 -int trace_flag = 0; int trace_on = 0; int trace_sl_acks = 1; @@ -214,7 +213,6 @@ static param_export_t params[] = { {"fromtag_column", PARAM_STR, &fromtag_column}, {"totag_column", PARAM_STR, &totag_column}, {"direction_column", PARAM_STR, &direction_column}, - {"trace_flag", INT_PARAM, &trace_flag}, {"trace_on", INT_PARAM, &trace_on}, {"traced_user_avp", PARAM_STR, &traced_user_avp_str}, {"trace_table_avp", PARAM_STR, &trace_table_avp_str}, @@ -276,12 +274,6 @@ static int mod_init(void) return -1; } - if(trace_flag < 0 || trace_flag > (int)MAX_FLAG) { - LM_ERR("invalid trace flag %d\n", trace_flag); - return -1; - } - trace_flag = 1 << trace_flag; - trace_to_database_flag = (int *)shm_malloc(sizeof(int)); if(trace_to_database_flag == NULL) { LM_ERR("no more shm memory left\n");

1 0

git:master:13378d72: siptrace: store sip_trace destination parameter for the entire dialog
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 13378d726acd90db294691bfbf2f67b89041cb6b URL: https://github.com/kamailio/kamailio/commit/13378d726acd90db294691bfbf2f67b… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: store sip_trace destination parameter for the entire dialog * value given as argument to sip_trace for destination was lost after the first request; this value is now included in siptrace_info parameter and carried via an AVP to DLGCB_CREATED callback and then stored in a dlg var; * fixed mem leak when calling serialize_siptrace_info; --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/13378d726acd90db294691bfbf2f67b… Patch: https://github.com/kamailio/kamailio/commit/13378d726acd90db294691bfbf2f67b…

1 0

git:master:157892f3: siptrace: Minor code fixes; remove useless error logs
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 157892f358ed0cf62c59d884dde171b2aaaf791e URL: https://github.com/kamailio/kamailio/commit/157892f358ed0cf62c59d884dde171b… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: Minor code fixes; remove useless error logs --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/157892f358ed0cf62c59d884dde171b… Patch: https://github.com/kamailio/kamailio/commit/157892f358ed0cf62c59d884dde171b… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 48fa9b97b4..f4cca2c1c8 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -352,14 +352,6 @@ static int mod_init(void) } } -#if 0 - else if(tmb.register_tmcb(0, 0, TMCB_REQUEST_IN, trace_onreq_in, 0, 0) - <= 0) { - LM_ERR("can't register trace_onreq_in\n"); - return -1; - } -#endif - /* bind the SL API */ if(sl_load_api(&slb) != 0) { LM_WARN("cannot bind to SL API. Will not install sl callbacks.\n"); @@ -712,9 +704,8 @@ enum siptrace_type_t parse_siptrace_flag(str* sflags) case '\t': break; default: - LM_ERR("idx %d %d\n", idx, sflags->len); - LM_ERR("Invalid character <%c> in <%.*s>!\n", sflags->s[idx], - sflags->len, sflags->s); + LM_ERR("Invalid character <%c> in <%.*s> at position <%d>!\n", sflags->s[idx], + sflags->len, sflags->s, idx); return SIPTRACE_NONE; } } @@ -727,7 +718,6 @@ static int fixup_siptrace(void **param, int param_no) str sflags; enum siptrace_type_t trace_type; - LM_ERR("fixup function aaa\n"); if(param_no < 1 || param_no > 3) { LM_DBG("params:%s\n", (char *)*param); return 0; @@ -738,8 +728,8 @@ static int fixup_siptrace(void **param, int param_no) return fixup_spve_spve(param, param_no); } else if (param_no == 3) { /* tracing type; string only */ - sflags.s = *param; - sflags.len = strlen(*param); + sflags.s = (char *)*param; + sflags.len = strlen(sflags.s); trace_type = parse_siptrace_flag(&sflags); if (trace_type == SIPTRACE_NONE) { @@ -960,7 +950,8 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * } else if (trace_type == SIPTRACE_DIALOG) { trace_transaction(msg, info, 1); if (unlikely(dlgb.set_dlg_var == NULL)) { - LM_ERR("Dialog api not loaded! will trace only current transaction!\n"); + /* FIXME should we abort tracing here? */ + LM_WARN("Dialog api not loaded! will trace only current transaction!\n"); } else { /* serialize what's in info */ /* save correlation id in siptrace_info avp @@ -1626,7 +1617,6 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int registe /* trace current message on out */ msg->msg_flags |= FL_SIPTRACE; - LM_ERR("trace request out registration\n"); if(tmb.register_tmcb(msg, 0, TMCB_REQUEST_SENT, trace_onreq_out, info, 0) <= 0) { LM_ERR("can't register trace_onreq_out\n"); return; @@ -1639,7 +1629,6 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int registe } /* trace reply on out */ - LM_CRIT("trace resp sent!\n"); if(tmb.register_tmcb(msg, 0, TMCB_RESPONSE_SENT, trace_onreply_out, info, register_free_func ? free_trace_info : 0) <= 0) { LM_ERR("can't register trace_onreply_out\n"); @@ -1666,8 +1655,6 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p int_str avp_value; struct usr_avp* avp = NULL; - LM_ERR("TRACING THIS DIALOGHES!\n"); - if (!dlgb.get_dlg) { LM_ERR("Dialog API not loaded! Trace off...\n"); return; @@ -1709,11 +1696,6 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p return; } - /* flag for stateless replies?? */ - - /* trace negative ACKS? */ - /* trace 180? */ - /* trace CANCEL and BYE transactions */ return; }

1 0

git:master:d00be11b: siptrace: Add code to trace incoming CANCEL transcations
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: d00be11be0e5fceec5274bf3bfd02951c3752c90 URL: https://github.com/kamailio/kamailio/commit/d00be11be0e5fceec5274bf3bfd0295… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: Add code to trace incoming CANCEL transcations --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/d00be11be0e5fceec5274bf3bfd0295… Patch: https://github.com/kamailio/kamailio/commit/d00be11be0e5fceec5274bf3bfd0295… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index ae1f53d7f3..48fa9b97b4 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1166,11 +1166,23 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) return; } } + + /* for incoming cancel this is the only play(i've found) where I have the CANCEL transaction + * and can register a callback for the reply */ memset(&sto, 0, sizeof(siptrace_data_t)); - if(traced_user_avp.n != 0) - sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, - &sto.avp_value, &sto.state); + if (unlikely(type == TMCB_E2ECANCEL_IN)) { + msg->msg_flags |= FL_SIPTRACE; + if(tmb.register_tmcb(msg, 0, TMCB_RESPONSE_READY, trace_onreply_out, *ps->param, 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((sto.avp == NULL) && trace_is_off(msg)) { LM_DBG("trace off...\n"); @@ -1180,11 +1192,16 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) if(sip_trace_prepare(msg) < 0) return; - if(ps->send_buf.len > 0) { - sto.body = ps->send_buf; + if (unlikely(type == TMCB_E2ECANCEL_IN)) { + sto.body.s = msg->buf; + sto.body.len = msg->len; } else { - sto.body.s = "No request buffer"; - sto.body.len = sizeof("No request buffer") - 1; + 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.callid = msg->callid->body; @@ -1245,7 +1262,16 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) } } - sto.dir = "out"; + /* FIXME the callback is designed for outgoing requests but this along with + * the callback registration at the begining of the function it's for a special + * case - incoming CANCEL transactions; they were not traced before; TMCB_E2ECANCEL_IN + * will throw the incoming request through this function and the callback in the beginning + * will make sure the reply for this cancel is caught */ + if (unlikely(type == TMCB_E2ECANCEL_IN)) { + sto.dir = "in"; + } else { + sto.dir = "out"; + } sto.fromtag = get_from(msg)->tag_value; sto.totag = get_to(msg)->tag_value; @@ -1361,13 +1387,18 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) return; } memset(&sto, 0, sizeof(siptrace_data_t)); - 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(t->uas.request)) { - LM_DBG("trace off...\n"); - return; + /* can't(don't know) set FL_SIPTRACE flag from trace_onreq_out because + * there no access to CANCEL transaction there */ + if (likely(type != TMCB_RESPONSE_READY)) { + 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(t->uas.request)) { + LM_DBG("trace off...\n"); + return; + } } req = ps->req; @@ -1463,7 +1494,6 @@ 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) { LM_DBG("storing negative ack...\n"); - /* this condition should not exist but there seems to be a BUG in kamailio * letting requests other than the ACK inside */ if (ps->req->first_line.u.request.method_value != METHOD_ACK) { @@ -1623,6 +1653,11 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int registe LM_ERR("can't register trace_onreply_in\n"); return; } + + if(tmb.register_tmcb(msg, 0, TMCB_E2ECANCEL_IN, trace_onreq_out, info, 0) <= 0) { + LM_ERR("can't register trace_onreply_in\n"); + return; + } } //static void trace_dialog(sip_msg_t* msg, siptrace_info_t* info)

1 0

git:master:fd17c99e: siptrace: check if a request is set to avoid local transaction crash
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: fd17c99eea3e41c087b8c73467608fd90ae37420 URL: https://github.com/kamailio/kamailio/commit/fd17c99eea3e41c087b8c73467608fd… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: check if a request is set to avoid local transaction crash --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/fd17c99eea3e41c087b8c73467608fd… Patch: https://github.com/kamailio/kamailio/commit/fd17c99eea3e41c087b8c73467608fd… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 242c4ab92b..ae1f53d7f3 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1690,6 +1690,17 @@ static void trace_dialog_transaction(struct dlg_cell* dlg, int type, struct dlg_ memset(&info, 0, sizeof(siptrace_info_t)); info.correlation_id = dlgb.get_dlg_var(dlg, &siptrace_info_dlgkey); + /** + * DUAL BYE - internally generated BYE from kamailio + * set flag to signal request_in callback which will register + * transaction callbacks to catch caller and callee BYEs and their + * responses + */ + if (params->req == NULL && params->rpl == NULL) { + LM_DBG("dual bye!\n"); + return; + } + trace_transaction(params->req, &info, 0); sip_trace(params->req, NULL, info.correlation_id, NULL);

1 0

git:master:1b319682: siptrace: trace negative ACKs
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 1b3196823c5004ee9f1402ff3a50227a66b14365 URL: https://github.com/kamailio/kamailio/commit/1b3196823c5004ee9f1402ff3a50227… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: trace negative ACKs --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/1b3196823c5004ee9f1402ff3a50227… Patch: https://github.com/kamailio/kamailio/commit/1b3196823c5004ee9f1402ff3a50227… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 7c4a4ff810..242c4ab92b 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -92,6 +92,7 @@ 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_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); static void trace_sl_onreply_out(sl_cbp_t *slcb); static void trace_sl_ack_in(sl_cbp_t *slcb); @@ -1271,7 +1272,7 @@ static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps) req = ps->req; msg = ps->rpl; - if(msg == NULL || req == NULL) { + if((type != TMCB_ACK_NEG_IN) && (msg == NULL || req == NULL)) { LM_DBG("no reply\n"); return; } @@ -1281,8 +1282,8 @@ static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps) sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, &sto.avp_value, &sto.state); - if((sto.avp == NULL) && trace_is_off(req)) { - LM_DBG("trace off...\n"); + if((type != TMCB_ACK_NEG_IN) && ((sto.avp == NULL) && trace_is_off(req))) { + LM_DBG("trace off... %d %d\n", sto.avp == NULL, trace_is_off(req)); return; } @@ -1459,6 +1460,19 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) return; } +static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps) +{ + LM_DBG("storing negative ack...\n"); + + /* this condition should not exist but there seems to be a BUG in kamailio + * letting requests other than the ACK inside */ + if (ps->req->first_line.u.request.method_value != METHOD_ACK) { + return; + } + + sip_trace(ps->req, 0, NULL, NULL); +} + static int serialize_siptrace_info(siptrace_info_t* info, str* serial_data) { if (info == NULL || info->correlation_id == NULL) { @@ -1604,6 +1618,11 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int registe /* TODO */ /* check the following callbacks: TMCB_REQUEST_PENDING, TMCB_RESPONSE_READY, TMCB_ACK_NEG_IN */ + /* trace reply on in */ + if(tmb.register_tmcb(msg, 0, TMCB_ACK_NEG_IN, trace_tm_neg_ack_in, info, 0) <= 0) { + LM_ERR("can't register trace_onreply_in\n"); + return; + } } //static void trace_dialog(sip_msg_t* msg, siptrace_info_t* info)

1 0

git:master:fa7eb2ab: siptrace: add basic transaction and dialog level tracing
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: fa7eb2ab595665f1ff95caf819d260b86bb8ca2b URL: https://github.com/kamailio/kamailio/commit/fa7eb2ab595665f1ff95caf819d260b… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: add basic transaction and dialog level tracing Added a new parameter to sip_trace() function which is the tracing type. This can be m(message)/t(transaction)/d(dialog). Transaction level tracing is done by registering REQUEST_SENT, REPLY_RECIEVED and REPLY_SENT callbacks when sip_trace() is called. Transaction module has to be loaded and the function call has to be made from a request route. Dialog level tracing is a little more complicated. INVITE transaction is traced the same level as a transaction traced with 't' flag. For the other transactions DLGCB_CREATED callback is used to know when dialog is created and callbacks for the rest of the dialog can be created. Correlation_id has to be carried all the way to this callback which is called after all the routes are called. In order to pass the correlation_id from sip_trace() to DLGCB_CREATED correlation_id has been saved into an avp. Also, since DLGCB_CREATED is called for all dialogs and some users may opt out not to trace some dialogs, FL_SIPTRACE message flag has been added to signal from sip_trace() to the callback whether this dialog should be traced or not. Moreover FL_SIPTRACE flag is used to signal whether stateless replies shall be traced, such as the 200 OK generated after a successful registration. The implementation is not complete, some messages such as the 180 and negative acks will be missing. Moreover internally generated BYE transacitons at timeout might be missing but these shall be fixed in future commits. --- Modified: src/core/parser/msg_parser.h Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/fa7eb2ab595665f1ff95caf819d260b… Patch: https://github.com/kamailio/kamailio/commit/fa7eb2ab595665f1ff95caf819d260b…

1 0

git:master:a383027e: topos: set context when executing event route
by Daniel-Constantin Mierla 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: a383027eae25e63a779ecf9377facefdd2e05ef6 URL: https://github.com/kamailio/kamailio/commit/a383027eae25e63a779ecf9377facef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-09T13:04:19+02:00 topos: set context when executing event route - should fix detection of using KSR.drop() - reported by GH #1924 --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a383027eae25e63a779ecf9377facef… Patch: https://github.com/kamailio/kamailio/commit/a383027eae25e63a779ecf9377facef… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index e13029db54..f6b6a3a2f5 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -521,7 +521,7 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, run_top_route(event_rt.rlist[evidx], (msg)?msg:fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, (msg)?msg:fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, evname)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
32
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 2019