- sr-dev - kamailio.org

git:5.3:63aef547: core: cfg.y - init static global variables
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: 5.3 Commit: 63aef54729c61755fecfb1df94f6a793853c330c URL: https://github.com/kamailio/kamailio/commit/63aef54729c61755fecfb1df94f6a79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T12:28:03+01:00 core: cfg.y - init static global variables (cherry picked from commit 8c5b92ee638a33e612e68cf85a1d37ab5e5d2c22) --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/63aef54729c61755fecfb1df94f6a79… Patch: https://github.com/kamailio/kamailio/commit/63aef54729c61755fecfb1df94f6a79… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 0042af8327..2275b18018 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -134,21 +134,21 @@ extern char* yy_number_str; static void yyerror(char* s, ...); static void yyerror_at(struct cfg_pos* pos, char* s, ...); -static char* tmp; -static int i_tmp; -static struct socket_id* lst_tmp; -static struct name_lst* nl_tmp; -static int rt; /* Type of route block for find_export */ -static str* str_tmp; -static str s_tmp; -static struct ip_addr* ip_tmp; -static struct avp_spec* s_attr; +static char* tmp = NULL; +static int i_tmp = 0; +static struct socket_id* lst_tmp = NULL; +static struct name_lst* nl_tmp = NULL; +static int rt = 0; /* Type of route block for find_export */ +static str* str_tmp = NULL; +static str s_tmp = STR_NULL; +static struct ip_addr* ip_tmp = NULL; +static struct avp_spec* s_attr = NULL; static select_t sel; -static select_t* sel_ptr; -static pv_spec_t* pv_spec; -static struct action *mod_func_action; -static struct lvalue* lval_tmp; -static struct rvalue* rval_tmp; +static select_t* sel_ptr = NULL; +static pv_spec_t* pv_spec = NULL; +static struct action *mod_func_action = NULL; +static struct lvalue* lval_tmp = NULL; +static struct rvalue* rval_tmp = NULL; static void warn(char* s, ...); static void warn_at(struct cfg_pos* pos, char* s, ...); @@ -165,7 +165,7 @@ static struct socket_id* mk_listen_id2(struct name_lst*, int, int); static void free_name_lst(struct name_lst* lst); static void free_socket_id_lst(struct socket_id* i); -static struct case_stms* mk_case_stm(struct rval_expr* ct, int is_re, +static struct case_stms* mk_case_stm(struct rval_expr* ct, int is_re, struct action* a, int* err); static int case_check_type(struct case_stms* stms); static int case_check_default(struct case_stms* stms);

1 0

git:5.3:15ce49ba: sipcapture: declare extern heptime in hep.c and init it to null
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: 5.3 Commit: 15ce49badcd67ec0a4227661b090c4e8318dd3cd URL: https://github.com/kamailio/kamailio/commit/15ce49badcd67ec0a4227661b090c4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T12:27:35+01:00 sipcapture: declare extern heptime in hep.c and init it to null (cherry picked from commit 16bc15156ecc8a8f4f66c44b064db854d0e3e4e0) --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/15ce49badcd67ec0a4227661b090c4e… Patch: https://github.com/kamailio/kamailio/commit/15ce49badcd67ec0a4227661b090c4e… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 7606241074..2934c2c0d2 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -37,7 +37,7 @@ static int count = 0; -struct hep_timeinfo *heptime; +extern struct hep_timeinfo *heptime; /* HEPv2 HEPv3 */ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri); diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 5da37cbde7..094d6ea168 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -294,7 +294,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timeinfo *heptime; +struct hep_timeinfo *heptime = NULL; /*! \brief * Exported functions

1 0

git:5.3:c96f7c20: pv: debug messages when setting shv via rpc
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: 5.3 Commit: c96f7c208499179b6931775084edda193e720dd9 URL: https://github.com/kamailio/kamailio/commit/c96f7c208499179b6931775084edda1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T12:27:10+01:00 pv: debug messages when setting shv via rpc (cherry picked from commit 7f95cd207b5dd56ace92837ad989f234e64a2471) --- Modified: src/modules/pv/pv_shv.c --- Diff: https://github.com/kamailio/kamailio/commit/c96f7c208499179b6931775084edda1… Patch: https://github.com/kamailio/kamailio/commit/c96f7c208499179b6931775084edda1… --- diff --git a/src/modules/pv/pv_shv.c b/src/modules/pv/pv_shv.c index 0de41e8d37..990fadbf22 100644 --- a/src/modules/pv/pv_shv.c +++ b/src/modules/pv/pv_shv.c @@ -546,8 +546,9 @@ void rpc_shv_set(rpc_t* rpc, void* c) if (rpc->scan(c, "d", &ival) != 1) { rpc->fault(c, 500, "Missing integer parameter value (Parameters: varname type value)"); return; - } + } isv.n = ival; + LM_DBG("setting %.*s to int %d\n", varname.len, varname.s, ival); } else if (strcasecmp(type.s, "str") == 0 ) { /* String value */ if (rpc->scan(c, "S", &value) != 1) { @@ -556,6 +557,8 @@ void rpc_shv_set(rpc_t* rpc, void* c) } isv.s = value; flags = VAR_VAL_STR; + LM_DBG("setting %.*s to str %.*s\n", varname.len, varname.s, + value.len, value.s); } else { rpc->fault(c, 500, "Unknown parameter type (Types: int or str)"); return;

1 0

git:5.3:a7248dd1: sms: removed duplicate declaration of global variables
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: 5.3 Commit: a7248dd187b89cdeab9d72a2de574d4eaab4987d URL: https://github.com/kamailio/kamailio/commit/a7248dd187b89cdeab9d72a2de574d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T12:27:24+01:00 sms: removed duplicate declaration of global variables (cherry picked from commit f8284418ea7d16dec970260cb92eb1af35bbf643) --- Modified: src/modules/sms/libsms_modem.c Modified: src/modules/sms/sms_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a7248dd187b89cdeab9d72a2de574d4… Patch: https://github.com/kamailio/kamailio/commit/a7248dd187b89cdeab9d72a2de574d4… --- diff --git a/src/modules/sms/libsms_modem.c b/src/modules/sms/libsms_modem.c index fe0be1f8a7..7b43352d6b 100644 --- a/src/modules/sms/libsms_modem.c +++ b/src/modules/sms/libsms_modem.c @@ -35,7 +35,6 @@ mailto:s.frings@mail.isis.de #define optz(_n,_l) (buf+buf_len-(((_n)+(_l)>buf_len)?buf_len:(_n)+(_l))) /* global variables */ -int sms_report_type; cds_report cds_report_func; diff --git a/src/modules/sms/sms_funcs.c b/src/modules/sms/sms_funcs.c index e88f6813af..32efec520c 100644 --- a/src/modules/sms/sms_funcs.c +++ b/src/modules/sms/sms_funcs.c @@ -47,8 +47,6 @@ struct network networks[MAX_NETWORKS]; int net_pipes_in[MAX_NETWORKS]; int nr_of_networks; int nr_of_modems; -int *queued_msgs; -int use_contact; struct tm_binds tmb;

1 0

git:master:e2604478: pua: extern declaration of global variable in header file
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: e260447833f616066e0fa23e51e791822b55b039 URL: https://github.com/kamailio/kamailio/commit/e260447833f616066e0fa23e51e7918… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T12:24:48+01:00 pua: extern declaration of global variable in header file --- Modified: src/modules/pua/pua.h --- Diff: https://github.com/kamailio/kamailio/commit/e260447833f616066e0fa23e51e7918… Patch: https://github.com/kamailio/kamailio/commit/e260447833f616066e0fa23e51e7918… --- diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h index 3958294b77..57cc379ebe 100644 --- a/src/modules/pua/pua.h +++ b/src/modules/pua/pua.h @@ -48,7 +48,7 @@ extern str outbound_proxy; extern int check_remote_contact; extern int dbmode; -int reginfo_increase_version; +extern int reginfo_increase_version; extern int update_pua(ua_pres_t* p); extern int clean_puadb( int update_period, int min_expires );

1 0

git:master:b7c47ce4: siputils: contact encoding functions exported to kemi
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: b7c47ce4ceea9ce97431bdd921afa2a59617e1c5 URL: https://github.com/kamailio/kamailio/commit/b7c47ce4ceea9ce97431bdd921afa2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T12:19:40+01:00 siputils: contact encoding functions exported to kemi --- Modified: src/modules/siputils/contact_ops.c Modified: src/modules/siputils/contact_ops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/b7c47ce4ceea9ce97431bdd921afa2a… Patch: https://github.com/kamailio/kamailio/commit/b7c47ce4ceea9ce97431bdd921afa2a… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 5183f40ab6..bc48a8771b 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -44,7 +44,7 @@ #include <string.h> -int encode_contact (struct sip_msg *msg, char *encoding_prefix,char *public_ip) +int ki_encode_contact (sip_msg_t *msg, str *eprefix, str *eaddr) { contact_body_t *cb; contact_t *c; @@ -85,7 +85,7 @@ int encode_contact (struct sip_msg *msg, char *encoding_prefix,char *public_ip) /* we visit each contact */ if(c != NULL) { uri = c->uri; - res = encode_uri(uri, encoding_prefix, public_ip, separator, &newUri); + res = encode_uri(uri, eprefix->s, eaddr->s, separator, &newUri); if(res != 0) { LM_ERR("failed encoding contact.Code %d\n", res); @@ -103,8 +103,7 @@ int encode_contact (struct sip_msg *msg, char *encoding_prefix,char *public_ip) c = c->next; uri = c->uri; - res = encode_uri( - uri, encoding_prefix, public_ip, separator, &newUri); + res = encode_uri(uri, eprefix->s, eaddr->s, separator, &newUri); if(res != 0) { LM_ERR("failed encode_uri.Code %d\n", res); #ifdef STRICT_CHECK @@ -121,8 +120,20 @@ int encode_contact (struct sip_msg *msg, char *encoding_prefix,char *public_ip) return 1; } - int -decode_contact (struct sip_msg *msg,char *unused1,char *unused2) +int encode_contact(sip_msg_t *msg, char *encoding_prefix, char *public_ip) +{ + str eprefix = STR_NULL; + str eaddr = STR_NULL; + + eprefix.s = encoding_prefix; + eprefix.len = strlen(eprefix.s); + eaddr.s = public_ip; + eaddr.len = strlen(eaddr.s); + + return ki_encode_contact(msg, &eprefix, &eaddr); +} + +int ki_decode_contact(sip_msg_t *msg) { str uri; @@ -177,8 +188,12 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) return 1; } - int -decode_contact_header (struct sip_msg *msg,char *unused1,char *unused2) +int decode_contact(sip_msg_t *msg, char *unused1, char *unused2) +{ + return ki_decode_contact(msg); +} + +int ki_decode_contact_header(sip_msg_t *msg) { contact_body_t *cb; @@ -255,6 +270,10 @@ decode_contact_header (struct sip_msg *msg,char *unused1,char *unused2) } +int decode_contact_header(sip_msg_t *msg, char *unused1, char *unused2) +{ + return ki_decode_contact_header(msg); +} int diff --git a/src/modules/siputils/contact_ops.h b/src/modules/siputils/contact_ops.h index ef925c761b..939b80ac6c 100644 --- a/src/modules/siputils/contact_ops.h +++ b/src/modules/siputils/contact_ops.h @@ -64,6 +64,9 @@ struct uri_format typedef struct uri_format contact_fields_t; +int ki_encode_contact (sip_msg_t *msg, str *eprefix, str *eaddr); +int ki_decode_contact(sip_msg_t *msg); +int ki_decode_contact_header(sip_msg_t *msg); int encode_contact (struct sip_msg *msg, char *encoding_prefix,char *public_ip); int decode_contact (struct sip_msg *msg, char *unused1,char *unused2); diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index aa847ae9c4..e9593da3b4 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -546,6 +546,21 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("encode_contact"), + SR_KEMIP_INT, ki_encode_contact, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("siputils"), str_init("decode_contact"), + SR_KEMIP_INT, ki_decode_contact, + { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("siputils"), str_init("decode_contact_header"), + SR_KEMIP_INT, ki_decode_contact_header, + { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:04d082d2: CONTRIBUTING.md: section for first line of the commit message [skip ci]
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 04d082d2a89f8e0d3646856cb81666f9f03fdffa URL: https://github.com/kamailio/kamailio/commit/04d082d2a89f8e0d3646856cb81666f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T11:39:02+01:00 CONTRIBUTING.md: section for first line of the commit message [skip ci] - note about [skip ci] flag in first line --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/04d082d2a89f8e0d3646856cb81666f… Patch: https://github.com/kamailio/kamailio/commit/04d082d2a89f8e0d3646856cb81666f… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f90d1c492b..fca94e33de 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -81,13 +81,20 @@ Please create the commit messages following the GIT convention: * start with one short line, preferably less then 50 chars summarizing the changes (this is referred later as "first line of the commit message") * then one empty line - * then a more detailed description + * then a more detailed description (the "commit message content") + +#### First Line Of The Commit Message #### Think of the first line as of an email "Subject" line. In fact it will be used as "Subject" in the generated commit emails and it will also be used when generating the Changelog (e.g. git log --pretty=oneline). -Please start always with the prefix of the component (subsystem) that is modified by the commit, for example: + +The first line (subjecthas to contain meaningful text about what that commit +does, do not put just a reference to bug tracker or pull request items + +Please start always with the prefix of the component (subsystem) that is modified +by the commit, for example: * `core`: more fixup helper functions * `core`: tcp - support for haproxy protocol * `core`: mem - added faster malloc @@ -96,13 +103,19 @@ Please start always with the prefix of the component (subsystem) that is modifie * `lib`: srutils - critical bug fix for abc case * `kamctl`: added support for management of module xyz +At the end of the first line some CI flags can be added. Available at this +moment: + + * `[skip ci]` - skip continous integration builds for source code, recommended + to be added when updating documentation, example configs or other utilities. + Example: + * `msilo: docs - updated example for m_dump() function [skip ci]` + #### Commit Message Content #### - * first line (subject line) has to contain meaningful text about what that commit - does, do not put just a reference to bug tracker or pull request items - * commit message must describe the changes done by the patch +* commit message must describe the changes done by the patch * other details (e.g., how to reproduce, backtrace, sip packets, ...) belong - to content (comments) of the pull request. Example: + to content (comments) of the pull request. Example of a full commit message: ``` core: added latency_limit_cfg global parameter

1 0

git:master:7bea3020: ims_qos: more extern declarations in the header files
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 7bea30203b85b7ed17434ee3f301faa0cedcba76 URL: https://github.com/kamailio/kamailio/commit/7bea30203b85b7ed17434ee3f301faa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T11:14:26+01:00 ims_qos: more extern declarations in the header files --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.h Modified: src/modules/ims_qos/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/7bea30203b85b7ed17434ee3f301faa… Patch: https://github.com/kamailio/kamailio/commit/7bea30203b85b7ed17434ee3f301faa… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 27964f5b64..c2e2ae06a1 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -75,7 +75,11 @@ MODULE_VERSION - extern gen_lock_t* process_lock; /* lock on the process table */ +extern gen_lock_t* process_lock; /* lock on the process table */ + +stat_var* stat_aar_timeouts; +stat_var* aar_replies_received; +stat_var* aar_replies_response_time; str orig_session_key = str_init("originating"); str term_session_key = str_init("terminating"); diff --git a/src/modules/ims_qos/rx_aar.h b/src/modules/ims_qos/rx_aar.h index 0a9a63b51a..10fa2cc059 100644 --- a/src/modules/ims_qos/rx_aar.h +++ b/src/modules/ims_qos/rx_aar.h @@ -54,7 +54,7 @@ #include "../../core/mod_fix.h" #include "../../core/locking.h" -struct cdp_binds cdpb; +extern struct cdp_binds cdpb; extern cdp_avp_bind_t *cdp_avp; /*this is the parcel to pass for CDP async for AAR*/ diff --git a/src/modules/ims_qos/stats.h b/src/modules/ims_qos/stats.h index 2de4bcdfa3..86424b94a2 100644 --- a/src/modules/ims_qos/stats.h +++ b/src/modules/ims_qos/stats.h @@ -51,9 +51,9 @@ #include "../../core/counters.h" -stat_var* stat_aar_timeouts; -stat_var* aar_replies_received; -stat_var* aar_replies_response_time; +extern stat_var* stat_aar_timeouts; +extern stat_var* aar_replies_received; +extern stat_var* aar_replies_response_time; int register_stats(); unsigned long get_avg_aar_response_time();

1 0

git:master:a8395274: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: a83952746263725500d92772038b64a3d58db3a0 URL: https://github.com/kamailio/kamailio/commit/a83952746263725500d92772038b64a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-04T10:46:17+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README Modified: src/modules/tm/README Modified: src/modules/usrloc/README Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/a83952746263725500d92772038b64a… Patch: https://github.com/kamailio/kamailio/commit/a83952746263725500d92772038b64a…

1 0

[kamailio/kamailio] Doc fixes (#2238)
by Bastian Triller 04 Mar '20

04 Mar '20

#### Pre-Submission Checklist    - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2238 -- Commit Summary -- * acc_json: doc fixes * usrloc: doc fixes * tm: docs - fix title for parameter event_callback_lres_sent * websocket: docs - fix title for parameter rm_delay_interval -- File Changes -- M src/modules/acc_json/doc/acc_json_admin.xml (29) M src/modules/tm/doc/params.xml (2) M src/modules/usrloc/doc/usrloc_admin.xml (22) M src/modules/websocket/doc/websocket_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2238.patch https://github.com/kamailio/kamailio/pull/2238.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/2238

2 2

git:master:8d5ea6fb: Merge pull request #2238 from btriller/doc-fixes
by GitHub 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 8d5ea6fbbc1d213c2f284720977dc67b8bb89b49 URL: https://github.com/kamailio/kamailio/commit/8d5ea6fbbc1d213c2f284720977dc67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-04T10:42:29+01:00 Merge pull request #2238 from btriller/doc-fixes Doc fixes --- Modified: src/modules/acc_json/doc/acc_json_admin.xml Modified: src/modules/tm/doc/params.xml Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8d5ea6fbbc1d213c2f284720977dc67… Patch: https://github.com/kamailio/kamailio/commit/8d5ea6fbbc1d213c2f284720977dc67…

1 0

git:master:c4a566bf: websocket: docs - fix title for parameter rm_delay_interval
by Bastian Triller 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: c4a566bf8df05b55a690a4ad9ea5f5dfe8961e0e URL: https://github.com/kamailio/kamailio/commit/c4a566bf8df05b55a690a4ad9ea5f5d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-03-04T10:26:42+01:00 websocket: docs - fix title for parameter rm_delay_interval --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c4a566bf8df05b55a690a4ad9ea5f5d… Patch: https://github.com/kamailio/kamailio/commit/c4a566bf8df05b55a690a4ad9ea5f5d… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 132ede160b..35e0e626a6 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -499,7 +499,7 @@ modparam("websocket", "timer_interval", 5) </para> <para><emphasis>Default value is 5.</emphasis></para> <example> - <title>Set <varname>rm_timer_interval</varname>parameter</title> + <title>Set <varname>rm_delay_interval</varname>parameter</title> <programlisting format="linespecific"> ... modparam("websocket", "rm_delay_interval", 2)

1 0

git:master:305ba1b2: usrloc: doc fixes
by Bastian Triller 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 305ba1b23bae19a4042c3e8fa88451b47ac69ff5 URL: https://github.com/kamailio/kamailio/commit/305ba1b23bae19a4042c3e8fa88451b… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-03-04T10:26:12+01:00 usrloc: doc fixes * add doc for parameter reg_id_column * fix title for parameter partition_column --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/305ba1b23bae19a4042c3e8fa88451b… Patch: https://github.com/kamailio/kamailio/commit/305ba1b23bae19a4042c3e8fa88451b… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index d23b2a9e7e..902d0586c1 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -456,6 +456,26 @@ modparam("usrloc", "instance_column", "myinstance") </example> </section> + <section id="usrloc.p.reg_id_column"> + <title><varname>reg_id_column</varname> (string)</title> + <para> + Name of database table column containing the value for reg-id. + </para> + <para> + <emphasis> + Default value is <quote>reg_id</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>reg_id_column</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "reg_id_column", "r_id") +... +</programlisting> + </example> + </section> + <section id="usrloc.p.server_id_column"> <title><varname>server_id_column</varname> (string)</title> <para> @@ -527,7 +547,7 @@ modparam("usrloc", "keepalive_column", "kalive") </emphasis> </para> <example> - <title>Set <varname>partitioncolumn</varname> parameter</title> + <title>Set <varname>partition_column</varname> parameter</title> <programlisting format="linespecific"> ... modparam("usrloc", "partition_column", "part")

1 0

git:master:32a21b5b: tm: docs - fix title for parameter event_callback_lres_sent
by Bastian Triller 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 32a21b5bd17309175ba99186629fa0d4e6b21fa7 URL: https://github.com/kamailio/kamailio/commit/32a21b5bd17309175ba99186629fa0d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-03-04T10:26:42+01:00 tm: docs - fix title for parameter event_callback_lres_sent --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/32a21b5bd17309175ba99186629fa0d… Patch: https://github.com/kamailio/kamailio/commit/32a21b5bd17309175ba99186629fa0d… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 4c583ca782..512e7d40a0 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1440,7 +1440,7 @@ end </section> <section id="tm.p.event_callback_lres_sent"> - <title><varname>event_callback_lres</varname> (str)</title> + <title><varname>event_callback_lres_sent</varname> (str)</title> <para> The name of the function in the kemi configuration file (embedded scripting language such as Lua, Python, ...) to be executed instead

1 0

git:master:81a9c09b: acc_json: doc fixes
by Bastian Triller 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 81a9c09b7b25afc6bd9d0854c1bf7aa3c34d6b82 URL: https://github.com/kamailio/kamailio/commit/81a9c09b7b25afc6bd9d0854c1bf7aa… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-03-04T10:24:20+01:00 acc_json: doc fixes * fix parameter names acc_output_mqueue and acc_output_syslog * add missing parameter cdr_output_syslog --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81a9c09b7b25afc6bd9d0854c1bf7aa… Patch: https://github.com/kamailio/kamailio/commit/81a9c09b7b25afc6bd9d0854c1bf7aa… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 70b6df1d2b..ae0f9d68c4 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -69,7 +69,7 @@ <title><varname>acc_flag</varname> (integer)</title> <para> Request flag which needs to be set to account a transaction in acc_json. - See output_mqueue and output_syslog + See acc_output_mqueue and acc_output_syslog </para> <para> Default value is not-set (no flag). @@ -88,7 +88,7 @@ modparam("acc_json", "acc_flag", 2) <title><varname>acc_missed_flag</varname> (integer)</title> <para> Request flag which needs to be set to account missed calls in acc_json. - See output_mqueue and output_syslog + See acc_output_mqueue and acc_output_syslog </para> <para> Default value is not-set (no flag). @@ -181,8 +181,8 @@ modparam("acc_json", "acc_time_format", "%Y/%m/%d %H:%M:%S") </example> </section> - <section id="acc_json.p.output_mqueue"> - <title><varname>output_mqueue</varname> (integer)</title> + <section id="acc_json.p.acc_output_mqueue"> + <title><varname>acc_output_mqueue</varname> (integer)</title> <para> Requires the mqueue module. The acc module will queue json acc events in the specified mqueue. @@ -195,13 +195,13 @@ modparam("acc_json", "acc_time_format", "%Y/%m/%d %H:%M:%S") Default value is not-set mqueue will not be required. </para> <example> - <title>output_mqueue usage example</title> + <title>acc_output_mqueue usage example</title> <programlisting format="linespecific"> ... # example using json_mqueue/http_client to publish to NSQD max_while_loops=100000 modparam("mqueue", "mqueue", "name=acc_events;size=100000") -modparam("acc_json", "output_mqueue", "acc_events") +modparam("acc_json", "acc_output_mqueue", "acc_events") modparam("acc_json", "acc_flag", 2) modparam("acc_json", "acc_extra", "caller_ip_port=$avp(caller_ip_port);") modparam("rtimer", "timer", "name=nsqt;interval=1;mode=1;") @@ -234,8 +234,8 @@ route[RUN_ACC_PUBLISH] { </example> </section> - <section id="acc_json.p.output_syslog"> - <title><varname>output_syslog</varname> (integer)</title> + <section id="acc_json.p.acc_output_syslog"> + <title><varname>acc_output_syslog</varname> (integer)</title> <para> Control if the output of acc json should be sent to syslog. This is not dependent on Kamailio global logging settings, @@ -246,10 +246,10 @@ route[RUN_ACC_PUBLISH] { Default value is not-set (no flag). </para> <example> - <title>output_syslog example</title> + <title>acc_output_syslog example</title> <programlisting format="linespecific"> ... -modparam("acc_json", "output_syslog", 1) +modparam("acc_json", "acc_output_syslog", 1) modparam("acc_json", "acc_log_level", 2) modparam("acc_json", "acc_log_facility", "LOG_DAEMON") ... @@ -408,8 +408,13 @@ route[RUN_CDR_PUBLISH] { </programlisting> </example> </section> - -<section id="acc_json.p.cdr_log_facility"> + <section id="acc_json.p.cdr_output_syslog"> + <title><varname>cdr_output_syslog</varname> (integer)</title> + <para> + The acc module will log json cdr events to syslog. + </para> + </section> + <section id="acc_json.p.cdr_log_facility"> <title><varname>cdr_log_facility</varname> (integer)</title> <para> Log facility to which accounting messages are issued to syslog.

1 0

git:master:df5521fc: ims_qos: use extern in header files not to redeclare variables
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: df5521fcdfc96462eb191b774f242fe1d4616adb URL: https://github.com/kamailio/kamailio/commit/df5521fcdfc96462eb191b774f242fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T08:28:30+01:00 ims_qos: use extern in header files not to redeclare variables --- Modified: src/modules/ims_qos/cdpeventprocessor.h Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_aar.h Modified: src/modules/ims_qos/rx_avp.h --- Diff: https://github.com/kamailio/kamailio/commit/df5521fcdfc96462eb191b774f242fe… Patch: https://github.com/kamailio/kamailio/commit/df5521fcdfc96462eb191b774f242fe… --- diff --git a/src/modules/ims_qos/cdpeventprocessor.h b/src/modules/ims_qos/cdpeventprocessor.h index 4f2b4d688f..8f393656ee 100644 --- a/src/modules/ims_qos/cdpeventprocessor.h +++ b/src/modules/ims_qos/cdpeventprocessor.h @@ -67,8 +67,8 @@ typedef struct { int size; } cdp_cb_event_list_t; -str early_qosrelease_reason; -str confirmed_qosrelease_headers; +extern str early_qosrelease_reason; +extern str confirmed_qosrelease_headers; int init_cdp_cb_event_list(); void destroy_cdp_cb_event_list(); diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 684f3a75c5..2029035415 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -71,7 +71,7 @@ #define macro_name(_rc) #_rc //extern struct tm_binds tmb; -usrloc_api_t ul; +extern usrloc_api_t ul; extern struct ims_qos_counters_h ims_qos_cnts_h; diff --git a/src/modules/ims_qos/rx_aar.h b/src/modules/ims_qos/rx_aar.h index f12def162f..0a9a63b51a 100644 --- a/src/modules/ims_qos/rx_aar.h +++ b/src/modules/ims_qos/rx_aar.h @@ -55,7 +55,7 @@ #include "../../core/locking.h" struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern cdp_avp_bind_t *cdp_avp; /*this is the parcel to pass for CDP async for AAR*/ typedef struct saved_transaction { diff --git a/src/modules/ims_qos/rx_avp.h b/src/modules/ims_qos/rx_avp.h index c8f81b6f85..55840f3e81 100644 --- a/src/modules/ims_qos/rx_avp.h +++ b/src/modules/ims_qos/rx_avp.h @@ -64,8 +64,8 @@ struct AAA_AVP_List; struct AAAMessage; enum dialog_direction; -int audio_default_bandwidth; -int video_default_bandwidth; +extern int audio_default_bandwidth; +extern int video_default_bandwidth; /*helper*/

1 0

git:master:bfb717fc: ims_icscf: stats global variables made extern in header file
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: bfb717fc8504a079066a0fdc09b856a937a7b430 URL: https://github.com/kamailio/kamailio/commit/bfb717fc8504a079066a0fdc09b856a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T07:19:57+01:00 ims_icscf: stats global variables made extern in header file --- Modified: src/modules/ims_icscf/ims_icscf_mod.c Modified: src/modules/ims_icscf/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/bfb717fc8504a079066a0fdc09b856a… Patch: https://github.com/kamailio/kamailio/commit/bfb717fc8504a079066a0fdc09b856a… --- diff --git a/src/modules/ims_icscf/ims_icscf_mod.c b/src/modules/ims_icscf/ims_icscf_mod.c index 3aa9814c5b..1bc7b7e430 100644 --- a/src/modules/ims_icscf/ims_icscf_mod.c +++ b/src/modules/ims_icscf/ims_icscf_mod.c @@ -63,6 +63,13 @@ cdp_avp_bind_t *cdp_avp; sl_api_t slb; +stat_var* stat_uar_timeouts = NULL; +stat_var* stat_lir_timeouts = NULL; +stat_var* uar_replies_received = NULL; +stat_var* lir_replies_received = NULL; +stat_var* uar_replies_response_time = NULL; +stat_var* lir_replies_response_time = NULL; + //module parameters char* ims_icscf_db_url="mysql://icscf:heslo@localhost/hssdata"; /**< DB URL */ char* ims_icscf_db_nds_table="nds_trusted_domains"; /**< NDS table in DB */ diff --git a/src/modules/ims_icscf/stats.h b/src/modules/ims_icscf/stats.h index eb293f80be..dbe1dcd5d2 100644 --- a/src/modules/ims_icscf/stats.h +++ b/src/modules/ims_icscf/stats.h @@ -46,12 +46,12 @@ #include "../../core/counters.h" -stat_var* stat_uar_timeouts; -stat_var* stat_lir_timeouts; -stat_var* uar_replies_received; -stat_var* lir_replies_received; -stat_var* uar_replies_response_time; -stat_var* lir_replies_response_time; +extern stat_var* stat_uar_timeouts; +extern stat_var* stat_lir_timeouts; +extern stat_var* uar_replies_received; +extern stat_var* lir_replies_received; +extern stat_var* uar_replies_response_time; +extern stat_var* lir_replies_response_time; int register_stats(); unsigned long get_avg_uar_response_time();

1 0

MRCP kamailio module (for use with rtpengine)
by Dmitriy Borisov 03 Mar '20

03 Mar '20

Hello! I want to implement kamailio module for MRCP interaction. I need it for automatic machine detection (AMD) system. I will be grateful for any help and have some initial questions: 1. Is it interesting for anyone? 2. Now I reading http://www.asipto.com/pub/kamailio-devel-guide/ guide. Is it the newest one or I can find something more actual? I want to implement such scheme: https://unimrcp.org/ea/index.htm?goto=2:1:30 Where kamailio will be on place of PBX, rtp-sender will be on place of IP Phone (and will be connected to RTP stream via proc-subsystem to rtpengine (like a rtpengine-recorder daemon). I want to use same scheme as HTTP async module (define a route, which must be called on event receive). -- With best regards Dmitry Borisov

2 1

[kamailio/kamailio] New branch in DNS SRV failover is using wrong source socket (#2152)
by Thomas Lobker 03 Mar '20

03 Mar '20

### Description When relaying an `INVITE` from a Kamailio proxy to an interconnect we are using DNS SRV records for load-balancing and failover. The proxy is listening on both a private interface and a public interface with an rfc1918 (ie. `10.0.0.14`) and a public IP address (ie. `185.0.0.34`) respectively. The first branch (before DNS SRV failover) is working as expected. The message will be relayed from the received socket (`185.0.0.34`) to the interconnect. When this branch results in a timeout, the proxy will try to do DNS SRV failover. This new branch and any subsequent branches will no longer use the initial received socket as source. In our case we see that the private address (`10.0.0.14`) is now being used as source address. ### Troubleshooting #### Reproduction DNS SRV: ``` _sip._udp.transit.net. SRV 10 10 5060 transit1.net. _sip._udp.transit.net. SRV 20 10 5060 transit2.net. transit1.net. A 185.10.20.30 transit2.net. A 185.10.20.31 ``` Kamailio: ``` $du = "sip:transit.net;transport=udp"; xinfo("Relaying [$rm] request: [$ru] with Call-ID [$ci]"); t_set_fr(0, 1000); if (not t_relay()) { sl_reply_error(); } ``` Network flow: ``` 12:30:00 INVITE udp:10.0.0.18:5060 => udp:185.0.0.34:5060 (internal request to proxy) 12:30:00 INVITE udp:185.0.0.34:5060 => udp:185.10.20.30:5060 (relaying from proxy to interconnect) ^^^^^^^^^^ (request times out after 1 second, proxy will do a failover to the next endpoint) 12:30:01 INVITE udp:10.0.0.14:5060 => udp:185.10.20.31:5060 (relaying to next interconnect address) ^^^^^^^^^ ``` #### Log Messages Attempt to see where it goes wrong: ``` onsend_route { xinfo("[$RAut] [$Rut] [$sas]\n"); xinfo("$snd(buf)\n"); } ``` ``` INFO: [sip:185.0.0.34:5060;transport=udp] [sip:185.0.0.34:5060;transport=udp] [udp:10.0.0.18:5060] INFO: INVITE sip:+1234567890@transit.net;user=phone SIP/2.0#015#012Record-Route: <sip:185.0.0.34;lr;ftag=tDr7m6erX1N3D>#015#012Via: SIP/2.0/UDP 10.0.0.14;branch=z9hG4bKafe7.7fb590e263fa44677514193a6a1156ce.1#015#012Via: SIP/2.0/UDP 10.0.0.18;received=10.0.0.18;rport=5060;branch=z9hG4bK6t59a17N60FcB ... ``` So the `Record-Route` seems to be correct, but the top most `Via` header shows the private IP address. The message is being sent from the private IP address as well and never reaches the second address from the interconnect. ### Possible Solutions A workaround to add `$fs = "udp:185.0.0.34:5060"` in the `onsend_route` seems to be effective. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.3 (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_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 7.4.0 ``` * **Operating System**: ``` Ubuntu 18.04 LTS Linux proxy4 4.15.0-64-generic #73-Ubuntu SMP Thu Sep 12 13:16:13 UTC 2019 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/2152

2 11

git:master:32f37cdc: ims_isc: avoid duplicate declaration of isc_ulb by using extern
by Daniel-Constantin Mierla 03 Mar '20

03 Mar '20

Module: kamailio Branch: master Commit: 32f37cdc876abcd7127993e079c9a0132d1f6460 URL: https://github.com/kamailio/kamailio/commit/32f37cdc876abcd7127993e079c9a01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-03T17:26:58+01:00 ims_isc: avoid duplicate declaration of isc_ulb by using extern --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/32f37cdc876abcd7127993e079c9a01… Patch: https://github.com/kamailio/kamailio/commit/32f37cdc876abcd7127993e079c9a01… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index 41877fd515..870c85006f 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -46,7 +46,7 @@ #include "third_party_reg.h" #include "../../core/msg_translator.h" -usrloc_api_t isc_ulb;/*!< Structure containing pointers to usrloc functions*/ +extern usrloc_api_t isc_ulb;/*!< Structure containing pointers to usrloc functions*/ /*! \brief * Combines all Path HF bodies into one string.

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,stretch #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,stretch #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,bionic #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,bionic #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,jessie #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,jessie #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,buster #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,buster #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,precise #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,precise #1595
by kamailio＠sipwise.com 03 Mar '20

03 Mar '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

git:master:8156dd87: ims_auth: declare extern the stats variables in header file
by Daniel-Constantin Mierla 03 Mar '20

03 Mar '20

Module: kamailio Branch: master Commit: 8156dd87a977a011abb9652a997f4ba61eb3e642 URL: https://github.com/kamailio/kamailio/commit/8156dd87a977a011abb9652a997f4ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-03T13:28:30+01:00 ims_auth: declare extern the stats variables in header file --- Modified: src/modules/ims_auth/ims_auth_mod.c Modified: src/modules/ims_auth/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/8156dd87a977a011abb9652a997f4ba… Patch: https://github.com/kamailio/kamailio/commit/8156dd87a977a011abb9652a997f4ba… --- diff --git a/src/modules/ims_auth/ims_auth_mod.c b/src/modules/ims_auth/ims_auth_mod.c index 20e148b089..3fd7ca923f 100644 --- a/src/modules/ims_auth/ims_auth_mod.c +++ b/src/modules/ims_auth/ims_auth_mod.c @@ -62,6 +62,10 @@ MODULE_VERSION +stat_var* stat_mar_timeouts = NULL; +stat_var* mar_replies_received = NULL; +stat_var* mar_replies_response_time = NULL; + static void destroy(void); static int mod_init(void); diff --git a/src/modules/ims_auth/stats.h b/src/modules/ims_auth/stats.h index 321feed279..98499c1b56 100644 --- a/src/modules/ims_auth/stats.h +++ b/src/modules/ims_auth/stats.h @@ -47,9 +47,9 @@ #include "../../core/counters.h" #include "ims_auth_mod.h" -stat_var* stat_mar_timeouts; -stat_var* mar_replies_received; -stat_var* mar_replies_response_time; +extern stat_var* stat_mar_timeouts; +extern stat_var* mar_replies_received; +extern stat_var* mar_replies_response_time; int register_stats(); unsigned long get_avg_mar_response_time();

1 0

git:master:15d5676f: ims_dialog: declare extern dlg stats structure in header file
by Daniel-Constantin Mierla 03 Mar '20

03 Mar '20

Module: kamailio Branch: master Commit: 15d5676fd7b6d64616fbf8ebf9517f0d56a47f5c URL: https://github.com/kamailio/kamailio/commit/15d5676fd7b6d64616fbf8ebf9517f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-03T11:40:40+01:00 ims_dialog: declare extern dlg stats structure in header file --- Modified: src/modules/ims_dialog/dlg_ng_stats.c Modified: src/modules/ims_dialog/dlg_ng_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/15d5676fd7b6d64616fbf8ebf9517f0… Patch: https://github.com/kamailio/kamailio/commit/15d5676fd7b6d64616fbf8ebf9517f0… --- diff --git a/src/modules/ims_dialog/dlg_ng_stats.c b/src/modules/ims_dialog/dlg_ng_stats.c index 6cc2a9ebdd..744a394dc8 100644 --- a/src/modules/ims_dialog/dlg_ng_stats.c +++ b/src/modules/ims_dialog/dlg_ng_stats.c @@ -1,6 +1,6 @@ #include "dlg_ng_stats.h" -struct dialog_ng_counters_h dialog_ng_cnts_h; +struct dialog_ng_counters_h dialog_ng_cnts_h = {0}; /* dialog_ng counters definitions */ counter_def_t dialog_ng_cnt_defs[] = { @@ -31,4 +31,4 @@ int dialog_ng_stats_init() void dialog_ng_stats_destroy() { /* do nothing */ -} \ No newline at end of file +} diff --git a/src/modules/ims_dialog/dlg_ng_stats.h b/src/modules/ims_dialog/dlg_ng_stats.h index f162a34886..9dfd53a182 100644 --- a/src/modules/ims_dialog/dlg_ng_stats.h +++ b/src/modules/ims_dialog/dlg_ng_stats.h @@ -11,9 +11,9 @@ struct dialog_ng_counters_h { }; -struct dialog_ng_counters_h dialog_ng_cnts_h; +extern struct dialog_ng_counters_h dialog_ng_cnts_h; int dialog_ng_stats_init(); void dialog_ng_stats_destroy(); -#endif /* DIALOG_NG_STATS_H */ \ No newline at end of file +#endif /* DIALOG_NG_STATS_H */

1 0

git:master:047fdebf: core: cfg.y - detect use of function call as parameter of another function
by Daniel-Constantin Mierla 03 Mar '20

03 Mar '20

Module: kamailio Branch: master Commit: 047fdebff732c847fcde5b066ce1acd5f6c2219a URL: https://github.com/kamailio/kamailio/commit/047fdebff732c847fcde5b066ce1acd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-03T11:30:04+01:00 core: cfg.y - detect use of function call as parameter of another function - GH #2227 --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/047fdebff732c847fcde5b066ce1acd… Patch: https://github.com/kamailio/kamailio/commit/047fdebff732c847fcde5b066ce1acd… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 394386bb1b..23ab69ee08 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -3390,8 +3390,14 @@ cmd: } | CFG_RESET error { $$=0; yyerror("missing '(' or ')' ?"); } | CFG_RESET LPAREN error RPAREN { $$=0; yyerror("bad arguments, string expected"); } - | ID {mod_func_action = mk_action(MODULE0_T, 2, MODEXP_ST, NULL, NUMBER_ST, - 0); } LPAREN func_params RPAREN { + | ID { + if (mod_func_action != NULL) { + LM_ERR("function used inside params of another function: %s\n", $1); + yyerror("use of function execution inside params not allowed\n"); + exit(-1); + } + mod_func_action = mk_action(MODULE0_T, 2, MODEXP_ST, NULL, NUMBER_ST, 0); + } LPAREN func_params RPAREN { mod_func_action->val[0].u.data = find_export_record($1, mod_func_action->val[1].u.number, rt); if (mod_func_action->val[0].u.data == 0) { @@ -3415,6 +3421,7 @@ cmd: } $$ = mod_func_action; set_cfg_pos($$); + mod_func_action = NULL; } | ID error { yyerror("'('')' expected (function call)");} ;

1 0

git:master:8c5b92ee: core: cfg.y - init static global variables
by Daniel-Constantin Mierla 03 Mar '20

03 Mar '20

Module: kamailio Branch: master Commit: 8c5b92ee638a33e612e68cf85a1d37ab5e5d2c22 URL: https://github.com/kamailio/kamailio/commit/8c5b92ee638a33e612e68cf85a1d37a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-03T11:01:53+01:00 core: cfg.y - init static global variables --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/8c5b92ee638a33e612e68cf85a1d37a… Patch: https://github.com/kamailio/kamailio/commit/8c5b92ee638a33e612e68cf85a1d37a… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 56a8c9ab8c..394386bb1b 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -134,21 +134,21 @@ extern char* yy_number_str; static void yyerror(char* s, ...); static void yyerror_at(struct cfg_pos* pos, char* s, ...); -static char* tmp; -static int i_tmp; -static struct socket_id* lst_tmp; -static struct name_lst* nl_tmp; -static int rt; /* Type of route block for find_export */ -static str* str_tmp; -static str s_tmp; -static struct ip_addr* ip_tmp; -static struct avp_spec* s_attr; +static char* tmp = NULL; +static int i_tmp = 0; +static struct socket_id* lst_tmp = NULL; +static struct name_lst* nl_tmp = NULL; +static int rt = 0; /* Type of route block for find_export */ +static str* str_tmp = NULL; +static str s_tmp = STR_NULL; +static struct ip_addr* ip_tmp = NULL; +static struct avp_spec* s_attr = NULL; static select_t sel; -static select_t* sel_ptr; -static pv_spec_t* pv_spec; -static struct action *mod_func_action; -static struct lvalue* lval_tmp; -static struct rvalue* rval_tmp; +static select_t* sel_ptr = NULL; +static pv_spec_t* pv_spec = NULL; +static struct action *mod_func_action = NULL; +static struct lvalue* lval_tmp = NULL; +static struct rvalue* rval_tmp = NULL; static void warn(char* s, ...); static void warn_at(struct cfg_pos* pos, char* s, ...); @@ -165,7 +165,7 @@ static struct socket_id* mk_listen_id2(struct name_lst*, int, int); static void free_name_lst(struct name_lst* lst); static void free_socket_id_lst(struct socket_id* i); -static struct case_stms* mk_case_stm(struct rval_expr* ct, int is_re, +static struct case_stms* mk_case_stm(struct rval_expr* ct, int is_re, struct action* a, int* err); static int case_check_type(struct case_stms* stms); static int case_check_default(struct case_stms* stms);

1 0

git:master:a88cf96b: cdp: global variables declared extern in header file
by Daniel-Constantin Mierla 03 Mar '20

03 Mar '20

Module: kamailio Branch: master Commit: a88cf96b8ba3358c08e0e210f76320f6d7926b7d URL: https://github.com/kamailio/kamailio/commit/a88cf96b8ba3358c08e0e210f76320f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-03T10:34:02+01:00 cdp: global variables declared extern in header file --- Modified: src/modules/cdp/diameter_peer.h --- Diff: https://github.com/kamailio/kamailio/commit/a88cf96b8ba3358c08e0e210f76320f… Patch: https://github.com/kamailio/kamailio/commit/a88cf96b8ba3358c08e0e210f76320f… --- diff --git a/src/modules/cdp/diameter_peer.h b/src/modules/cdp/diameter_peer.h index 378a281dd5..f092f74ccc 100644 --- a/src/modules/cdp/diameter_peer.h +++ b/src/modules/cdp/diameter_peer.h @@ -65,10 +65,10 @@ typedef struct { pid_list_t *head,*tail; } pid_list_head_t; -pid_t *dp_first_pid; /**< first pid that we started from */ +extern pid_t *dp_first_pid; /**< first pid that we started from */ -pid_list_head_t *pid_list; /**< list of local processes */ -gen_lock_t *pid_list_lock; /**< lock for list of local processes */ +extern pid_list_head_t *pid_list; /**< list of local processes */ +extern gen_lock_t *pid_list_lock; /**< lock for list of local processes */ int diameter_peer_init_str(str config_str); int diameter_peer_init(char *cfg_filename);

1 0

git:master:16bc1515: sipcapture: declare extern heptime in hep.c and init it to null
by Daniel-Constantin Mierla 03 Mar '20

03 Mar '20

Module: kamailio Branch: master Commit: 16bc15156ecc8a8f4f66c44b064db854d0e3e4e0 URL: https://github.com/kamailio/kamailio/commit/16bc15156ecc8a8f4f66c44b064db85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-03T09:11:59+01:00 sipcapture: declare extern heptime in hep.c and init it to null --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/16bc15156ecc8a8f4f66c44b064db85… Patch: https://github.com/kamailio/kamailio/commit/16bc15156ecc8a8f4f66c44b064db85… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 7606241074..2934c2c0d2 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -37,7 +37,7 @@ static int count = 0; -struct hep_timeinfo *heptime; +extern struct hep_timeinfo *heptime; /* HEPv2 HEPv3 */ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri); diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 5da37cbde7..094d6ea168 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -294,7 +294,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timeinfo *heptime; +struct hep_timeinfo *heptime = NULL; /*! \brief * Exported functions

1 0

git:master:f8284418: sms: removed duplicate declaration of global variables
by Daniel-Constantin Mierla 02 Mar '20

02 Mar '20

Module: kamailio Branch: master Commit: f8284418ea7d16dec970260cb92eb1af35bbf643 URL: https://github.com/kamailio/kamailio/commit/f8284418ea7d16dec970260cb92eb1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-02T10:21:23+01:00 sms: removed duplicate declaration of global variables --- Modified: src/modules/sms/libsms_modem.c Modified: src/modules/sms/sms_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/f8284418ea7d16dec970260cb92eb1a… Patch: https://github.com/kamailio/kamailio/commit/f8284418ea7d16dec970260cb92eb1a… --- diff --git a/src/modules/sms/libsms_modem.c b/src/modules/sms/libsms_modem.c index fe0be1f8a7..7b43352d6b 100644 --- a/src/modules/sms/libsms_modem.c +++ b/src/modules/sms/libsms_modem.c @@ -35,7 +35,6 @@ mailto:s.frings@mail.isis.de #define optz(_n,_l) (buf+buf_len-(((_n)+(_l)>buf_len)?buf_len:(_n)+(_l))) /* global variables */ -int sms_report_type; cds_report cds_report_func; diff --git a/src/modules/sms/sms_funcs.c b/src/modules/sms/sms_funcs.c index e88f6813af..32efec520c 100644 --- a/src/modules/sms/sms_funcs.c +++ b/src/modules/sms/sms_funcs.c @@ -47,8 +47,6 @@ struct network networks[MAX_NETWORKS]; int net_pipes_in[MAX_NETWORKS]; int nr_of_networks; int nr_of_modems; -int *queued_msgs; -int use_contact; struct tm_binds tmb;

1 0

[kamailio/kamailio] [kamailio 5.2.5] Wrong send socket on a multi homed proxy (#2181)
by vitalikvoip 02 Mar '20

02 Mar '20

### Description Kamailio fails to forward in-dialog request over TCP/TLS/WS/WSS connection. ### Troubleshooting kamailio 5.2 branch has a commit 09ac3e47ef79dbd599b7dec5b84ae3b792f025ed cherry picked from master branch. It makes sense for master because get_send_socket2() behavior has changed and function became smarter and also there were some patches to propagate connection it to the uac structure. After applying this patch to 5.2.x kamailio searches for an outgoing socket, receives the first one due to limitations of get_send_socket2() and SND_F_FORCE_SOCKET flag. Then it fails to find an existing TCP connection by destination ip:port since it searches for a connection associated with a wrong socket. #### Log Messages  ``` Dec 11 21:33:49 kamailio[17999]: WARNING: <core> [core/msg_translator.c:2832]: via_builder(): TCP/TLS connection (id: 0) for WebSocket could not be found Dec 11 21:33:49 kamailio[17999]: ERROR: tm [t_msgbuilder.c:1372]: assemble_via(): via building failed Dec 11 21:33:49 kamailio[17999]: ERROR: tm [t_msgbuilder.c:1540]: build_uac_req(): error while assembling Via Dec 11 21:33:49 kamailio[17999]: ERROR: tm [uac.c:517]: t_uac_prepare(): Error while building message Dec 11 21:33:49 kamailio[17999]: ERROR: presence [notify.c:1798]: send_notify_request(): in function tmb.t_request_within Dec 11 21:33:49 kamailio[17999]: ERROR: presence [notify.c:1897]: notify(): sending Notify not successful Dec 11 21:33:49 kamailio[17999]: ERROR: presence [notify.c:1491]: publ_notify(): Could not send notify for message-summary ``` ### Possible Solutions Delete mentioned commit from the 5.2 branch.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.2.5 ``` * **Operating System**:  ``` 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/2181

3 6

git:5.2:ac37cb04: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 02 Mar '20

02 Mar '20

Module: kamailio Branch: 5.2 Commit: ac37cb04c0b5ca153342f44d7d7fd17a633afddd URL: https://github.com/kamailio/kamailio/commit/ac37cb04c0b5ca153342f44d7d7fd17… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-02T09:31:54+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/ac37cb04c0b5ca153342f44d7d7fd17… Patch: https://github.com/kamailio/kamailio/commit/ac37cb04c0b5ca153342f44d7d7fd17… --- diff --git a/src/modules/pua_dialoginfo/README b/src/modules/pua_dialoginfo/README index a8eecbb95a..e38c0e0eb5 100644 --- a/src/modules/pua_dialoginfo/README +++ b/src/modules/pua_dialoginfo/README @@ -48,10 +48,10 @@ Phil Lavin 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 6. Functions @@ -98,10 +98,10 @@ Chapter 1. Admin Guide 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 6. Functions @@ -281,10 +281,10 @@ Chapter 1. Admin Guide 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 5.1. include_callid (int) @@ -422,7 +422,7 @@ modparam("pua_dialoginfo", "disable_callee_publish_flag", 10) modparam("pua_dialoginfo", "use_pubruri_avps", 1) ... -5.11. pubruri_caller_avp (int) +5.11. pubruri_caller_avp (str) If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the caller (entity=caller) are sent using the @@ -438,7 +438,7 @@ modparam("pua_dialoginfo", "use_pubruri_avps", 1) modparam("pua_dialoginfo", "pubruri_caller_avp", "$avp(s:puburis_caller)") ... -5.12. pubruri_callee_avp (int) +5.12. pubruri_callee_avp (str) If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the callee (entity=callee) are sent using the @@ -468,7 +468,7 @@ modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:puburis_callee)") modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") ... -5.14. pubruri_callee_dlg_var (int) +5.14. pubruri_callee_dlg_var (str) Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed to restored the

1 0

git:5.3:0bed10f2: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 02 Mar '20

02 Mar '20

Module: kamailio Branch: 5.3 Commit: 0bed10f2ad80d192c50885ef3f7a948f1ba9322e URL: https://github.com/kamailio/kamailio/commit/0bed10f2ad80d192c50885ef3f7a948… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-02T09:31:40+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/0bed10f2ad80d192c50885ef3f7a948… Patch: https://github.com/kamailio/kamailio/commit/0bed10f2ad80d192c50885ef3f7a948… --- diff --git a/src/modules/pua_dialoginfo/README b/src/modules/pua_dialoginfo/README index a8eecbb95a..e38c0e0eb5 100644 --- a/src/modules/pua_dialoginfo/README +++ b/src/modules/pua_dialoginfo/README @@ -48,10 +48,10 @@ Phil Lavin 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 6. Functions @@ -98,10 +98,10 @@ Chapter 1. Admin Guide 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 6. Functions @@ -281,10 +281,10 @@ Chapter 1. Admin Guide 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 5.1. include_callid (int) @@ -422,7 +422,7 @@ modparam("pua_dialoginfo", "disable_callee_publish_flag", 10) modparam("pua_dialoginfo", "use_pubruri_avps", 1) ... -5.11. pubruri_caller_avp (int) +5.11. pubruri_caller_avp (str) If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the caller (entity=caller) are sent using the @@ -438,7 +438,7 @@ modparam("pua_dialoginfo", "use_pubruri_avps", 1) modparam("pua_dialoginfo", "pubruri_caller_avp", "$avp(s:puburis_caller)") ... -5.12. pubruri_callee_avp (int) +5.12. pubruri_callee_avp (str) If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the callee (entity=callee) are sent using the @@ -468,7 +468,7 @@ modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:puburis_callee)") modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") ... -5.14. pubruri_callee_dlg_var (int) +5.14. pubruri_callee_dlg_var (str) Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed to restored the

1 0

git:master:1ed7e896: modules: readme files regenerated - pua_dialoginfo ... [skip ci]
by Kamailio Dev 02 Mar '20

02 Mar '20

Module: kamailio Branch: master Commit: 1ed7e896f054a4c40dc1d95263f73c0aa1fcd29c URL: https://github.com/kamailio/kamailio/commit/1ed7e896f054a4c40dc1d95263f73c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-02T09:31:22+01:00 modules: readme files regenerated - pua_dialoginfo ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/1ed7e896f054a4c40dc1d95263f73c0… Patch: https://github.com/kamailio/kamailio/commit/1ed7e896f054a4c40dc1d95263f73c0… --- diff --git a/src/modules/pua_dialoginfo/README b/src/modules/pua_dialoginfo/README index a8eecbb95a..e38c0e0eb5 100644 --- a/src/modules/pua_dialoginfo/README +++ b/src/modules/pua_dialoginfo/README @@ -48,10 +48,10 @@ Phil Lavin 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 6. Functions @@ -98,10 +98,10 @@ Chapter 1. Admin Guide 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 6. Functions @@ -281,10 +281,10 @@ Chapter 1. Admin Guide 5.8. disable_caller_publish_flag (int) 5.9. disable_callee_publish_flag (int) 5.10. use_pubruri_avps (int) - 5.11. pubruri_caller_avp (int) - 5.12. pubruri_callee_avp (int) + 5.11. pubruri_caller_avp (str) + 5.12. pubruri_callee_avp (str) 5.13. pubruri_caller_dlg_var (str) - 5.14. pubruri_callee_dlg_var (int) + 5.14. pubruri_callee_dlg_var (str) 5.15. callee_trying (int) 5.1. include_callid (int) @@ -422,7 +422,7 @@ modparam("pua_dialoginfo", "disable_callee_publish_flag", 10) modparam("pua_dialoginfo", "use_pubruri_avps", 1) ... -5.11. pubruri_caller_avp (int) +5.11. pubruri_caller_avp (str) If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the caller (entity=caller) are sent using the @@ -438,7 +438,7 @@ modparam("pua_dialoginfo", "use_pubruri_avps", 1) modparam("pua_dialoginfo", "pubruri_caller_avp", "$avp(s:puburis_caller)") ... -5.12. pubruri_callee_avp (int) +5.12. pubruri_callee_avp (str) If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the callee (entity=callee) are sent using the @@ -468,7 +468,7 @@ modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:puburis_callee)") modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") ... -5.14. pubruri_callee_dlg_var (int) +5.14. pubruri_callee_dlg_var (str) Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed to restored the

1 0

git:5.2:6ece7d82: pua_dialoginfo: fix doc for pubruri_callee_dlg_var type
by Victor Seva 02 Mar '20

02 Mar '20

Module: kamailio Branch: 5.2 Commit: 6ece7d8288aca10a6d653f164df5b386ed3eb63e URL: https://github.com/kamailio/kamailio/commit/6ece7d8288aca10a6d653f164df5b38… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-02T09:27:42+01:00 pua_dialoginfo: fix doc for pubruri_callee_dlg_var type (cherry picked from commit ee34fa46d008426f710c38bf247f4dac9e11bfe7) --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6ece7d8288aca10a6d653f164df5b38… Patch: https://github.com/kamailio/kamailio/commit/6ece7d8288aca10a6d653f164df5b38… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index b3422ef12c..2d154c1d27 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -497,7 +497,7 @@ modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") </section> <section id="pua_dialoginfo.p.pubruri_callee_dlg_var"> - <title><varname>pubruri_callee_dlg_var</varname> (int)</title> + <title><varname>pubruri_callee_dlg_var</varname> (str)</title> <para> Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed

1 0

git:5.2:3dee7c64: pua_dialoginfo: fix doc for puburi_calle[e|r]_avp type
by Victor Seva 02 Mar '20

02 Mar '20

Module: kamailio Branch: 5.2 Commit: 3dee7c6488eb143141becf47e0edd2f3e6ce3cef URL: https://github.com/kamailio/kamailio/commit/3dee7c6488eb143141becf47e0edd2f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-02T09:27:46+01:00 pua_dialoginfo: fix doc for puburi_calle[e|r]_avp type (cherry picked from commit cd94a88d21c6d649d63791ba509845a38a6eb76b) --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3dee7c6488eb143141becf47e0edd2f… Patch: https://github.com/kamailio/kamailio/commit/3dee7c6488eb143141becf47e0edd2f… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index 2d154c1d27..c869344c17 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -435,7 +435,7 @@ modparam("pua_dialoginfo", "use_pubruri_avps", 1) </section> <section> - <title><varname>pubruri_caller_avp</varname> (int)</title> + <title><varname>pubruri_caller_avp</varname> (str)</title> <para> If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the caller (entity=caller) are sent using the value of the specified avp as R-Uri. If multiple AVPs with the same name (but different indexes) are present, for each value a corresponding PUBLISH-request is generated. @@ -455,7 +455,7 @@ modparam("pua_dialoginfo", "pubruri_caller_avp", "$avp(s:puburis_caller)") </section> <section> - <title><varname>pubruri_callee_avp</varname> (int)</title> + <title><varname>pubruri_callee_avp</varname> (str)</title> <para> If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the callee (entity=callee) are sent using the value of the specified avp as R-Uri. If multiple AVPs with the same name (but different indexes) are present, for each value a corresponding PUBLISH-request is generated.

1 0

git:5.3:e2d4024a: pua_dialoginfo: fix doc for pubruri_callee_dlg_var type
by Victor Seva 02 Mar '20

02 Mar '20

Module: kamailio Branch: 5.3 Commit: e2d4024a73306b3efc28b321e5d5d32b96601278 URL: https://github.com/kamailio/kamailio/commit/e2d4024a73306b3efc28b321e5d5d32… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-02T09:26:54+01:00 pua_dialoginfo: fix doc for pubruri_callee_dlg_var type (cherry picked from commit ee34fa46d008426f710c38bf247f4dac9e11bfe7) --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e2d4024a73306b3efc28b321e5d5d32… Patch: https://github.com/kamailio/kamailio/commit/e2d4024a73306b3efc28b321e5d5d32… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index b3422ef12c..2d154c1d27 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -497,7 +497,7 @@ modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") </section> <section id="pua_dialoginfo.p.pubruri_callee_dlg_var"> - <title><varname>pubruri_callee_dlg_var</varname> (int)</title> + <title><varname>pubruri_callee_dlg_var</varname> (str)</title> <para> Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed

1 0

git:5.3:34dffb14: pua_dialoginfo: fix doc for puburi_calle[e|r]_avp type
by Victor Seva 02 Mar '20

02 Mar '20

Module: kamailio Branch: 5.3 Commit: 34dffb148e2fa3e9d354532817acf490ac8c8e95 URL: https://github.com/kamailio/kamailio/commit/34dffb148e2fa3e9d354532817acf49… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-02T09:27:14+01:00 pua_dialoginfo: fix doc for puburi_calle[e|r]_avp type (cherry picked from commit cd94a88d21c6d649d63791ba509845a38a6eb76b) --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/34dffb148e2fa3e9d354532817acf49… Patch: https://github.com/kamailio/kamailio/commit/34dffb148e2fa3e9d354532817acf49… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index 2d154c1d27..c869344c17 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -435,7 +435,7 @@ modparam("pua_dialoginfo", "use_pubruri_avps", 1) </section> <section> - <title><varname>pubruri_caller_avp</varname> (int)</title> + <title><varname>pubruri_caller_avp</varname> (str)</title> <para> If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the caller (entity=caller) are sent using the value of the specified avp as R-Uri. If multiple AVPs with the same name (but different indexes) are present, for each value a corresponding PUBLISH-request is generated. @@ -455,7 +455,7 @@ modparam("pua_dialoginfo", "pubruri_caller_avp", "$avp(s:puburis_caller)") </section> <section> - <title><varname>pubruri_callee_avp</varname> (int)</title> + <title><varname>pubruri_callee_avp</varname> (str)</title> <para> If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the callee (entity=callee) are sent using the value of the specified avp as R-Uri. If multiple AVPs with the same name (but different indexes) are present, for each value a corresponding PUBLISH-request is generated.

1 0

git:master:cd94a88d: pua_dialoginfo: fix doc for puburi_calle[e|r]_avp type
by Victor Seva 02 Mar '20

02 Mar '20

Module: kamailio Branch: master Commit: cd94a88d21c6d649d63791ba509845a38a6eb76b URL: https://github.com/kamailio/kamailio/commit/cd94a88d21c6d649d63791ba509845a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-02T09:24:29+01:00 pua_dialoginfo: fix doc for puburi_calle[e|r]_avp type --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cd94a88d21c6d649d63791ba509845a… Patch: https://github.com/kamailio/kamailio/commit/cd94a88d21c6d649d63791ba509845a… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index 2d154c1d27..c869344c17 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -435,7 +435,7 @@ modparam("pua_dialoginfo", "use_pubruri_avps", 1) </section> <section> - <title><varname>pubruri_caller_avp</varname> (int)</title> + <title><varname>pubruri_caller_avp</varname> (str)</title> <para> If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the caller (entity=caller) are sent using the value of the specified avp as R-Uri. If multiple AVPs with the same name (but different indexes) are present, for each value a corresponding PUBLISH-request is generated. @@ -455,7 +455,7 @@ modparam("pua_dialoginfo", "pubruri_caller_avp", "$avp(s:puburis_caller)") </section> <section> - <title><varname>pubruri_callee_avp</varname> (int)</title> + <title><varname>pubruri_callee_avp</varname> (str)</title> <para> If use_pubruri_avps is enabled, PUBLISH-requests reporting dialog-information about the callee (entity=callee) are sent using the value of the specified avp as R-Uri. If multiple AVPs with the same name (but different indexes) are present, for each value a corresponding PUBLISH-request is generated.

1 0

git:master:ee34fa46: pua_dialoginfo: fix doc for pubruri_callee_dlg_var type
by Victor Seva 02 Mar '20

02 Mar '20

Module: kamailio Branch: master Commit: ee34fa46d008426f710c38bf247f4dac9e11bfe7 URL: https://github.com/kamailio/kamailio/commit/ee34fa46d008426f710c38bf247f4da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-02T09:20:22+01:00 pua_dialoginfo: fix doc for pubruri_callee_dlg_var type --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ee34fa46d008426f710c38bf247f4da… Patch: https://github.com/kamailio/kamailio/commit/ee34fa46d008426f710c38bf247f4da… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index b3422ef12c..2d154c1d27 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -497,7 +497,7 @@ modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") </section> <section id="pua_dialoginfo.p.pubruri_callee_dlg_var"> - <title><varname>pubruri_callee_dlg_var</varname> (int)</title> + <title><varname>pubruri_callee_dlg_var</varname> (str)</title> <para> Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed

1 0

git:5.3:e16ba9fe: Revert "tm: set send socket flag when computing the destination and local socket is found"
by Daniel-Constantin Mierla 02 Mar '20

02 Mar '20

Module: kamailio Branch: 5.3 Commit: e16ba9fe6b9e1a4c70b42c5822c7a05051da88c0 URL: https://github.com/kamailio/kamailio/commit/e16ba9fe6b9e1a4c70b42c5822c7a05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-02T09:02:33+01:00 Revert "tm: set send socket flag when computing the destination and local socket is found" This reverts commit 8d608d1c3ed0fe4c69cb02868b746cd0497dd1f5. --- Modified: src/modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/e16ba9fe6b9e1a4c70b42c5822c7a05… Patch: https://github.com/kamailio/kamailio/commit/e16ba9fe6b9e1a4c70b42c5822c7a05… --- diff --git a/src/modules/tm/ut.h b/src/modules/tm/ut.h index 98aaffa549..41e69c407f 100644 --- a/src/modules/tm/ut.h +++ b/src/modules/tm/ut.h @@ -296,7 +296,6 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, dst->proto, 0); if (dst->send_sock){ dst->to=to; - dst->send_flags.f |= SND_F_FORCE_SOCKET; return dst; /* found a good one */ } }while(dns_srv_handle_next(dns_h, err)); @@ -318,8 +317,6 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, proto2a(dst->proto), su2a(&dst->to, sizeof(dst->to))); /* ser_error = E_NO_SOCKET;*/ /* try to continue */ - } else { - dst->send_flags.f |= SND_F_FORCE_SOCKET; } return dst; }

1 0

git:master:dd6e2fd7: Revert "tm: set send socket flag when computing the destination and local socket is found"
by Daniel-Constantin Mierla 02 Mar '20

02 Mar '20

Module: kamailio Branch: master Commit: dd6e2fd7740f351ef3acbd4d36d7e4546ca10ded URL: https://github.com/kamailio/kamailio/commit/dd6e2fd7740f351ef3acbd4d36d7e45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-02T09:01:37+01:00 Revert "tm: set send socket flag when computing the destination and local socket is found" This reverts commit 8d608d1c3ed0fe4c69cb02868b746cd0497dd1f5. --- Modified: src/modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/dd6e2fd7740f351ef3acbd4d36d7e45… Patch: https://github.com/kamailio/kamailio/commit/dd6e2fd7740f351ef3acbd4d36d7e45… --- diff --git a/src/modules/tm/ut.h b/src/modules/tm/ut.h index 98aaffa549..41e69c407f 100644 --- a/src/modules/tm/ut.h +++ b/src/modules/tm/ut.h @@ -296,7 +296,6 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, dst->proto, 0); if (dst->send_sock){ dst->to=to; - dst->send_flags.f |= SND_F_FORCE_SOCKET; return dst; /* found a good one */ } }while(dns_srv_handle_next(dns_h, err)); @@ -318,8 +317,6 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, proto2a(dst->proto), su2a(&dst->to, sizeof(dst->to))); /* ser_error = E_NO_SOCKET;*/ /* try to continue */ - } else { - dst->send_flags.f |= SND_F_FORCE_SOCKET; } return dst; }

1 0

[kamailio/kamailio] Fedora 32/Rawhide build error: modules/siputils: multiple definition of `contact_flds_separator' (#2235)
by Anthony Messina 28 Feb '20

28 Feb '20

Just FYI/notice when preparing for Fedora 32 builds that for `src/modules/siputils`, `contact_flds_separator` is defined both in `contact_ops.h` and `siputils.c` ``` make[2]: Entering directory '/builddir/build/BUILD/kamailio-5.3.2/src/modules/siputils' gcc -shared -Wl,-O2 -Wl,-E -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions sipops.o config.o siputils.o rpid.o ring.o contact_ops.o chargingvector.o options.o utils.o checks.o -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/builddir/build/BUILD/kamailio-5.3.2/src/lib/srdb1 -o siputils.so make[2]: Leaving directory '/builddir/build/BUILD/kamailio-5.3.2/src/modules/siputils' /usr/bin/ld: contact_ops.o:/builddir/build/BUILD/kamailio-5.3.2/src/modules/siputils/contact_ops.h:51: multiple definition of `contact_flds_separator'; siputils.o:/builddir/build/BUILD/kamailio-5.3.2/src/modules/siputils/contact_ops.h:51: first defined here collect2: error: ld returned 1 exit status make[2]: *** [../../Makefile.rules:191: siputils.so] Error 1 make[1]: *** [Makefile:511: modules] Error 1 make: *** [Makefile:34: every-module] Error 2 ``` -- 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/2235

2 3

git:5.2:e3e93791: siputils: declare extern contact_flds_separator in header file
by Daniel-Constantin Mierla 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.2 Commit: e3e937914b30173f83fe91ad4d18f6fe6dbd2eb1 URL: https://github.com/kamailio/kamailio/commit/e3e937914b30173f83fe91ad4d18f6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-28T18:01:31+01:00 siputils: declare extern contact_flds_separator in header file - GH #2235 (cherry picked from commit 6e9b0fad487aadb22df10e90f3db6a104ca99cfc) (cherry picked from commit 66e33a0e3c7af9c51dc665556a022b6598e86843) --- Modified: src/modules/siputils/contact_ops.h --- Diff: https://github.com/kamailio/kamailio/commit/e3e937914b30173f83fe91ad4d18f6f… Patch: https://github.com/kamailio/kamailio/commit/e3e937914b30173f83fe91ad4d18f6f… --- diff --git a/src/modules/siputils/contact_ops.h b/src/modules/siputils/contact_ops.h index cb3c698ed3..ef925c761b 100644 --- a/src/modules/siputils/contact_ops.h +++ b/src/modules/siputils/contact_ops.h @@ -48,7 +48,7 @@ #define DEFAULT_SEPARATOR "*" -char *contact_flds_separator; +extern char *contact_flds_separator; struct uri_format

1 0

git:5.3:66e33a0e: siputils: declare extern contact_flds_separator in header file
by Daniel-Constantin Mierla 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.3 Commit: 66e33a0e3c7af9c51dc665556a022b6598e86843 URL: https://github.com/kamailio/kamailio/commit/66e33a0e3c7af9c51dc665556a022b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-28T18:00:41+01:00 siputils: declare extern contact_flds_separator in header file - GH #2235 (cherry picked from commit 6e9b0fad487aadb22df10e90f3db6a104ca99cfc) --- Modified: src/modules/siputils/contact_ops.h --- Diff: https://github.com/kamailio/kamailio/commit/66e33a0e3c7af9c51dc665556a022b6… Patch: https://github.com/kamailio/kamailio/commit/66e33a0e3c7af9c51dc665556a022b6… --- diff --git a/src/modules/siputils/contact_ops.h b/src/modules/siputils/contact_ops.h index cb3c698ed3..ef925c761b 100644 --- a/src/modules/siputils/contact_ops.h +++ b/src/modules/siputils/contact_ops.h @@ -48,7 +48,7 @@ #define DEFAULT_SEPARATOR "*" -char *contact_flds_separator; +extern char *contact_flds_separator; struct uri_format

1 0

git:master:6e9b0fad: siputils: declare extern contact_flds_separator in header file
by Daniel-Constantin Mierla 28 Feb '20

28 Feb '20

Module: kamailio Branch: master Commit: 6e9b0fad487aadb22df10e90f3db6a104ca99cfc URL: https://github.com/kamailio/kamailio/commit/6e9b0fad487aadb22df10e90f3db6a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-28T17:57:41+01:00 siputils: declare extern contact_flds_separator in header file - GH #2235 --- Modified: src/modules/siputils/contact_ops.h --- Diff: https://github.com/kamailio/kamailio/commit/6e9b0fad487aadb22df10e90f3db6a1… Patch: https://github.com/kamailio/kamailio/commit/6e9b0fad487aadb22df10e90f3db6a1… --- diff --git a/src/modules/siputils/contact_ops.h b/src/modules/siputils/contact_ops.h index cb3c698ed3..ef925c761b 100644 --- a/src/modules/siputils/contact_ops.h +++ b/src/modules/siputils/contact_ops.h @@ -48,7 +48,7 @@ #define DEFAULT_SEPARATOR "*" -char *contact_flds_separator; +extern char *contact_flds_separator; struct uri_format

1 0

git:master:7f95cd20: pv: debug messages when setting shv via rpc
by Daniel-Constantin Mierla 28 Feb '20

28 Feb '20

Module: kamailio Branch: master Commit: 7f95cd207b5dd56ace92837ad989f234e64a2471 URL: https://github.com/kamailio/kamailio/commit/7f95cd207b5dd56ace92837ad989f23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-28T17:57:41+01:00 pv: debug messages when setting shv via rpc --- Modified: src/modules/pv/pv_shv.c --- Diff: https://github.com/kamailio/kamailio/commit/7f95cd207b5dd56ace92837ad989f23… Patch: https://github.com/kamailio/kamailio/commit/7f95cd207b5dd56ace92837ad989f23… --- diff --git a/src/modules/pv/pv_shv.c b/src/modules/pv/pv_shv.c index 1f472664d7..fb4de51114 100644 --- a/src/modules/pv/pv_shv.c +++ b/src/modules/pv/pv_shv.c @@ -546,8 +546,9 @@ void rpc_shv_set(rpc_t* rpc, void* c) if (rpc->scan(c, "d", &ival) != 1) { rpc->fault(c, 500, "Missing integer parameter value (Parameters: varname type value)"); return; - } + } isv.n = ival; + LM_DBG("setting %.*s to int %d\n", varname.len, varname.s, ival); } else if (strcasecmp(type.s, "str") == 0 ) { /* String value */ if (rpc->scan(c, "S", &value) != 1) { @@ -556,6 +557,8 @@ void rpc_shv_set(rpc_t* rpc, void* c) } isv.s = value; flags = VAR_VAL_STR; + LM_DBG("setting %.*s to str %.*s\n", varname.len, varname.s, + value.len, value.s); } else { rpc->fault(c, 500, "Unknown parameter type (Types: int or str)"); return;

1 0

git:5.3:9539be33: dmq: small spelling fix in error message
by Henning Westerholt 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.3 Commit: 9539be33fa2026ace2090bc51427eb80346ffb4d URL: https://github.com/kamailio/kamailio/commit/9539be33fa2026ace2090bc51427eb8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-28T14:54:19+01:00 dmq: small spelling fix in error message (cherry picked from commit 97e3de1046cf5247f7a462385778409b02680149) --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/9539be33fa2026ace2090bc51427eb8… Patch: https://github.com/kamailio/kamailio/commit/9539be33fa2026ace2090bc51427eb8… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 9414e94e84..2b64d0e907 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -282,7 +282,7 @@ static int child_init(int rank) LM_DBG("starting worker process %d\n", i); newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); if(newpid < 0) { - LM_ERR("failed to form process\n"); + LM_ERR("failed to fork process\n"); return -1; } else if(newpid == 0) { /* child - this will loop forever */

1 0

git:5.2:89b3d358: pdbt: add pdb server message check
by Henning Westerholt 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.2 Commit: 89b3d358dcfb0bed63762a017c0dcd0d2f1aad9c URL: https://github.com/kamailio/kamailio/commit/89b3d358dcfb0bed63762a017c0dcd0… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-28T14:53:45+01:00 pdbt: add pdb server message check Related to 3c07e2351a94e4ff2cf3c6b9b9df4d7462cd5760 commit, but on server side. (cherry picked from commit 7db39bbc128233ae663061364c5545648e06d3a7) --- Modified: utils/pdbt/common.c --- Diff: https://github.com/kamailio/kamailio/commit/89b3d358dcfb0bed63762a017c0dcd0… Patch: https://github.com/kamailio/kamailio/commit/89b3d358dcfb0bed63762a017c0dcd0… --- diff --git a/utils/pdbt/common.c b/utils/pdbt/common.c index cd7b6558c4..f5bc54ecc8 100644 --- a/utils/pdbt/common.c +++ b/utils/pdbt/common.c @@ -11,9 +11,15 @@ void pdb_msg_dbg(struct pdb_msg msg) { LERR("id = %d\n", msg.hdr.id); LERR("len = %d\n", msg.hdr.length); LERR("payload = "); - for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { - LERR("%02X ", msg.bdy.payload[i]); + + if(msg.hdr.length > sizeof(msg.hdr)) { + for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { + LERR("%02X ", msg.bdy.payload[i]); + } + } else { + LERR("Incorrect value in msg.hdr.length \n"); } + LERR("\n"); return ;

1 0

git:5.2:d0acd767: dmq: small spelling fix in error message
by Henning Westerholt 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.2 Commit: d0acd76775659407caeaaa87f29cfa617014ed44 URL: https://github.com/kamailio/kamailio/commit/d0acd76775659407caeaaa87f29cfa6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-28T14:53:56+01:00 dmq: small spelling fix in error message (cherry picked from commit 97e3de1046cf5247f7a462385778409b02680149) --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/d0acd76775659407caeaaa87f29cfa6… Patch: https://github.com/kamailio/kamailio/commit/d0acd76775659407caeaaa87f29cfa6… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index ebfa021119..4ef263eecc 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -282,7 +282,7 @@ static int child_init(int rank) LM_DBG("starting worker process %d\n", i); newpid = fork_process(PROC_NOCHLDINIT, "DMQ WORKER", 0); if(newpid < 0) { - LM_ERR("failed to form process\n"); + LM_ERR("failed to fork process\n"); return -1; } else if(newpid == 0) { /* child - this will loop forever */

1 0

git:master:97e3de10: dmq: small spelling fix in error message
by Henning Westerholt 28 Feb '20

28 Feb '20

Module: kamailio Branch: master Commit: 97e3de1046cf5247f7a462385778409b02680149 URL: https://github.com/kamailio/kamailio/commit/97e3de1046cf5247f7a462385778409… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-28T14:52:14+01:00 dmq: small spelling fix in error message --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/97e3de1046cf5247f7a462385778409… Patch: https://github.com/kamailio/kamailio/commit/97e3de1046cf5247f7a462385778409… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 9414e94e84..2b64d0e907 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -282,7 +282,7 @@ static int child_init(int rank) LM_DBG("starting worker process %d\n", i); newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); if(newpid < 0) { - LM_ERR("failed to form process\n"); + LM_ERR("failed to fork process\n"); return -1; } else if(newpid == 0) { /* child - this will loop forever */

1 0

git:5.3:e83a966b: pdbt: add pdb server message check
by Stefan Mititelu 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.3 Commit: e83a966b69500a9b30ba41858beee77d154a3b4d URL: https://github.com/kamailio/kamailio/commit/e83a966b69500a9b30ba41858beee77… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-28T13:43:13+02:00 pdbt: add pdb server message check Related to 3c07e2351a94e4ff2cf3c6b9b9df4d7462cd5760 commit, but on server side. (cherry picked from commit 7db39bbc128233ae663061364c5545648e06d3a7) --- Modified: utils/pdbt/common.c --- Diff: https://github.com/kamailio/kamailio/commit/e83a966b69500a9b30ba41858beee77… Patch: https://github.com/kamailio/kamailio/commit/e83a966b69500a9b30ba41858beee77… --- diff --git a/utils/pdbt/common.c b/utils/pdbt/common.c index cd7b6558c4..f5bc54ecc8 100644 --- a/utils/pdbt/common.c +++ b/utils/pdbt/common.c @@ -11,9 +11,15 @@ void pdb_msg_dbg(struct pdb_msg msg) { LERR("id = %d\n", msg.hdr.id); LERR("len = %d\n", msg.hdr.length); LERR("payload = "); - for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { - LERR("%02X ", msg.bdy.payload[i]); + + if(msg.hdr.length > sizeof(msg.hdr)) { + for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { + LERR("%02X ", msg.bdy.payload[i]); + } + } else { + LERR("Incorrect value in msg.hdr.length \n"); } + LERR("\n"); return ;

1 0

[kamailio/kamailio] pdbt: add pdb server message check (#2233)
by Stefan Mititelu 28 Feb '20

28 Feb '20

Related to 3c07e2351a94e4ff2cf3c6b9b9df4d7462cd5760 commit, but on server side.   #### 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  Add a message check for pdb server. Related to commit: 3c07e23 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2233 -- Commit Summary -- * pdbt: add pdb server message check -- File Changes -- M utils/pdbt/common.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2233.patch https://github.com/kamailio/kamailio/pull/2233.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/2233

2 3

git:master:7db39bbc: pdbt: add pdb server message check
by Stefan Mititelu 28 Feb '20

28 Feb '20

Module: kamailio Branch: master Commit: 7db39bbc128233ae663061364c5545648e06d3a7 URL: https://github.com/kamailio/kamailio/commit/7db39bbc128233ae663061364c55456… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-02-28T13:40:47+02:00 pdbt: add pdb server message check Related to 3c07e2351a94e4ff2cf3c6b9b9df4d7462cd5760 commit, but on server side. --- Modified: utils/pdbt/common.c --- Diff: https://github.com/kamailio/kamailio/commit/7db39bbc128233ae663061364c55456… Patch: https://github.com/kamailio/kamailio/commit/7db39bbc128233ae663061364c55456… --- diff --git a/utils/pdbt/common.c b/utils/pdbt/common.c index cd7b6558c4..f5bc54ecc8 100644 --- a/utils/pdbt/common.c +++ b/utils/pdbt/common.c @@ -11,9 +11,15 @@ void pdb_msg_dbg(struct pdb_msg msg) { LERR("id = %d\n", msg.hdr.id); LERR("len = %d\n", msg.hdr.length); LERR("payload = "); - for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { - LERR("%02X ", msg.bdy.payload[i]); + + if(msg.hdr.length > sizeof(msg.hdr)) { + for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { + LERR("%02X ", msg.bdy.payload[i]); + } + } else { + LERR("Incorrect value in msg.hdr.length \n"); } + LERR("\n"); return ;

1 0

git:5.2:18842e3f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.2 Commit: 18842e3f1d0b7b37df2306164d67a203fe80486e URL: https://github.com/kamailio/kamailio/commit/18842e3f1d0b7b37df2306164d67a20… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-28T09:47:09+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/18842e3f1d0b7b37df2306164d67a20… Patch: https://github.com/kamailio/kamailio/commit/18842e3f1d0b7b37df2306164d67a20…

1 0

git:5.3:d542db02: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.3 Commit: d542db02ac2e6e3c70878138aec99566f8fdd7da URL: https://github.com/kamailio/kamailio/commit/d542db02ac2e6e3c70878138aec9956… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-28T09:46:48+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/d542db02ac2e6e3c70878138aec9956… Patch: https://github.com/kamailio/kamailio/commit/d542db02ac2e6e3c70878138aec9956…

1 0

git:master:20d3c31d: modules: readme files regenerated - pua_dialoginfo ... [skip ci]
by Kamailio Dev 28 Feb '20

28 Feb '20

Module: kamailio Branch: master Commit: 20d3c31dd9f919367bdf2cad9607ec945c816fc9 URL: https://github.com/kamailio/kamailio/commit/20d3c31dd9f919367bdf2cad9607ec9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-28T09:46:26+01:00 modules: readme files regenerated - pua_dialoginfo ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/20d3c31dd9f919367bdf2cad9607ec9… Patch: https://github.com/kamailio/kamailio/commit/20d3c31dd9f919367bdf2cad9607ec9…

1 0

git:5.2:a5a73ea2: pua_dialoginfo: add missing module parameter from docs
by Victor Seva 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.2 Commit: a5a73ea21349beb76e49379658ad283661bf5de7 URL: https://github.com/kamailio/kamailio/commit/a5a73ea21349beb76e49379658ad283… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-28T09:34:06+01:00 pua_dialoginfo: add missing module parameter from docs intruduced at 09d1bdc38b51619c65c6a9ec8f293cf9c395c6c1 back in 2009 (cherry picked from commit 9e1e7d4d3f7eb2e08d092c9b0b772fc76cf09376) --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a5a73ea21349beb76e49379658ad283… Patch: https://github.com/kamailio/kamailio/commit/a5a73ea21349beb76e49379658ad283… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index eda556245f..b3422ef12c 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -314,6 +314,25 @@ modparam("pua_dialoginfo", "override_lifetime", 300) </example> </section> + <section> + <title><varname>include_req_uri</varname> (int)</title> + <para> + controls if R-URI is going to be used instead of To header value in + the PUBLISH as "identity" on "remote" node. + </para> + <para> + <emphasis>Default value is <quote>0</quote>. Disabled</emphasis> + </para> + <example> + <title>Set <varname>include_req_uri</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "include_req_uri", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>caller_confirmed</varname> (int)</title> <para>

1 0

git:5.3:64eb8558: pua_dialoginfo: add missing module parameter from docs
by Victor Seva 28 Feb '20

28 Feb '20

Module: kamailio Branch: 5.3 Commit: 64eb8558e94016f74d6a15c2b72f92e6cf8b645e URL: https://github.com/kamailio/kamailio/commit/64eb8558e94016f74d6a15c2b72f92e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-28T09:33:09+01:00 pua_dialoginfo: add missing module parameter from docs intruduced at 09d1bdc38b51619c65c6a9ec8f293cf9c395c6c1 back in 2009 (cherry picked from commit 9e1e7d4d3f7eb2e08d092c9b0b772fc76cf09376) --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64eb8558e94016f74d6a15c2b72f92e… Patch: https://github.com/kamailio/kamailio/commit/64eb8558e94016f74d6a15c2b72f92e… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index eda556245f..b3422ef12c 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -314,6 +314,25 @@ modparam("pua_dialoginfo", "override_lifetime", 300) </example> </section> + <section> + <title><varname>include_req_uri</varname> (int)</title> + <para> + controls if R-URI is going to be used instead of To header value in + the PUBLISH as "identity" on "remote" node. + </para> + <para> + <emphasis>Default value is <quote>0</quote>. Disabled</emphasis> + </para> + <example> + <title>Set <varname>include_req_uri</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "include_req_uri", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>caller_confirmed</varname> (int)</title> <para>

1 0

git:master:9e1e7d4d: pua_dialoginfo: add missing module parameter from docs
by Victor Seva 28 Feb '20

28 Feb '20

Module: kamailio Branch: master Commit: 9e1e7d4d3f7eb2e08d092c9b0b772fc76cf09376 URL: https://github.com/kamailio/kamailio/commit/9e1e7d4d3f7eb2e08d092c9b0b772fc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-28T09:31:57+01:00 pua_dialoginfo: add missing module parameter from docs intruduced at 09d1bdc38b51619c65c6a9ec8f293cf9c395c6c1 back in 2009 --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9e1e7d4d3f7eb2e08d092c9b0b772fc… Patch: https://github.com/kamailio/kamailio/commit/9e1e7d4d3f7eb2e08d092c9b0b772fc… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index eda556245f..b3422ef12c 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -314,6 +314,25 @@ modparam("pua_dialoginfo", "override_lifetime", 300) </example> </section> + <section> + <title><varname>include_req_uri</varname> (int)</title> + <para> + controls if R-URI is going to be used instead of To header value in + the PUBLISH as "identity" on "remote" node. + </para> + <para> + <emphasis>Default value is <quote>0</quote>. Disabled</emphasis> + </para> + <example> + <title>Set <varname>include_req_uri</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "include_req_uri", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>caller_confirmed</varname> (int)</title> <para>

1 0

git:master:5bc7bd99: pv: exported functions for $var(...) management
by Daniel-Constantin Mierla 27 Feb '20

27 Feb '20

Module: kamailio Branch: master Commit: 5bc7bd99305b1341c6d0a6a4d2d3138432b14819 URL: https://github.com/kamailio/kamailio/commit/5bc7bd99305b1341c6d0a6a4d2d3138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-27T10:07:42+01:00 pv: exported functions for $var(...) management --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_svar.c Modified: src/modules/pv/pv_svar.h --- Diff: https://github.com/kamailio/kamailio/commit/5bc7bd99305b1341c6d0a6a4d2d3138… Patch: https://github.com/kamailio/kamailio/commit/5bc7bd99305b1341c6d0a6a4d2d3138… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 78f7398b0b..a233a684cf 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1811,6 +1811,21 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("var_seti"), + SR_KEMIP_INT, ki_var_seti, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("var_sets"), + SR_KEMIP_INT, ki_var_sets, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("var_get"), + SR_KEMIP_XVAL, ki_var_get, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("shv_seti"), SR_KEMIP_INT, ki_shv_seti, { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 1245cef7f5..255f9f2040 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -239,3 +239,84 @@ void destroy_vars(void) destroy_vars_list(script_vars); destroy_vars_list(script_vars_null); } + +/** + * + */ +int ki_var_seti(sip_msg_t *msg, str *vname, int ival) +{ + int_str isv; + script_var_t *var = NULL; + + var = add_var(vname, VAR_TYPE_ZERO); + + if(var==NULL) { + LM_ERR("$var(%.*s) is not defined\n", vname->len, vname->s); + return -1; + } + + isv.n = ival; + if(set_var_value(var, &isv, 0)==NULL) { + LM_ERR("error - cannot set $var(%.*s) to ival\n", vname->len, vname->s); + return -1; + } + + return 1; +} + +/** + * + */ +int ki_var_sets(sip_msg_t *msg, str *vname, str *sval) +{ + int_str isv; + script_var_t *var = NULL; + + var = add_var(vname, VAR_TYPE_ZERO); + + if(var==NULL) { + LM_ERR("$var(%.*s) is not defined\n", vname->len, vname->s); + return -1; + } + + isv.s = *sval; + if(set_var_value(var, &isv, VAR_VAL_STR)==NULL) { + LM_ERR("error - cannot set $var(%.*s) to sval\n", vname->len, vname->s); + return -1; + } + return 1; +} + +/** + * + */ +static sr_kemi_xval_t _sr_kemi_var_xval = {0}; + +/** + * + */ +sr_kemi_xval_t* ki_var_get(sip_msg_t *msg, str *vname) +{ + script_var_t *var = NULL; + + memset(&_sr_kemi_var_xval, 0, sizeof(sr_kemi_xval_t)); + + var = get_var_by_name(vname); + if(var==NULL) { + LM_WARN("$var(%.*s) is not defined - return value 0\n", + vname->len, vname->s); + _sr_kemi_var_xval.vtype = SR_KEMIP_INT; + _sr_kemi_var_xval.v.n = 0; + return &_sr_kemi_var_xval; + } + + if(var->v.flags&VAR_VAL_STR) { + _sr_kemi_var_xval.vtype = SR_KEMIP_STR; + _sr_kemi_var_xval.v.s = var->v.value.s; + return &_sr_kemi_var_xval; + } else { + _sr_kemi_var_xval.v.n = var->v.value.n; + _sr_kemi_var_xval.vtype = SR_KEMIP_INT; + return &_sr_kemi_var_xval; + } +} diff --git a/src/modules/pv/pv_svar.h b/src/modules/pv/pv_svar.h index 9e2e9d6e8d..b9f78ab749 100644 --- a/src/modules/pv/pv_svar.h +++ b/src/modules/pv/pv_svar.h @@ -27,6 +27,7 @@ #ifndef _PV_SVAR_H_ #define _PV_SVAR_H_ +#include "../../core/kemi.h" #include "../../core/usr_avp.h" #define VAR_VAL_INT (0) /* value is INT (other flags not set) */ @@ -57,5 +58,9 @@ void reset_vars(void); void destroy_vars(void); void destroy_vars_list(script_var_t *svl); +int ki_var_seti(sip_msg_t *msg, str *vname, int ival); +int ki_var_sets(sip_msg_t *msg, str *vname, str *sval); +sr_kemi_xval_t* ki_var_get(sip_msg_t *msg, str *vname); + #endif

1 0

git:master:10b38842: pv: exporte xavp copy variants to kemi framework
by Daniel-Constantin Mierla 27 Feb '20

27 Feb '20

Module: kamailio Branch: master Commit: 10b388423c8e60e1b0b7d625239a0df0afcfac0e URL: https://github.com/kamailio/kamailio/commit/10b388423c8e60e1b0b7d625239a0df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-27T09:46:34+01:00 pv: exporte xavp copy variants to kemi framework --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/10b388423c8e60e1b0b7d625239a0df… Patch: https://github.com/kamailio/kamailio/commit/10b388423c8e60e1b0b7d625239a0df…

1 0

git:master:8538a8c8: pv: formatted the very long lines in w_xavp_copy_dst()
by Daniel-Constantin Mierla 27 Feb '20

27 Feb '20

Module: kamailio Branch: master Commit: 8538a8c884adb0d844b0da7804711ceb8f427304 URL: https://github.com/kamailio/kamailio/commit/8538a8c884adb0d844b0da7804711ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-27T09:17:59+01:00 pv: formatted the very long lines in w_xavp_copy_dst() --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/8538a8c884adb0d844b0da7804711ce… Patch: https://github.com/kamailio/kamailio/commit/8538a8c884adb0d844b0da7804711ce…

1 0

git:master:a8f60be7: pv: kemi functions for $shv(...) management
by Daniel-Constantin Mierla 27 Feb '20

27 Feb '20

Module: kamailio Branch: master Commit: a8f60be7e3467611f0329198e3a1c4e4196b280f URL: https://github.com/kamailio/kamailio/commit/a8f60be7e3467611f0329198e3a1c4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-27T09:14:24+01:00 pv: kemi functions for $shv(...) management --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_shv.c Modified: src/modules/pv/pv_shv.h --- Diff: https://github.com/kamailio/kamailio/commit/a8f60be7e3467611f0329198e3a1c4e… Patch: https://github.com/kamailio/kamailio/commit/a8f60be7e3467611f0329198e3a1c4e…

1 0

[kamailio/kamailio] configure apns push notification in kamailio (#2232)
by masterhydra 27 Feb '20

27 Feb '20

Hello, I need to configure apns push notification in kamailio kindly help. I have a file push.php It is capable to push notification on ios device know i want to implement in kamailio when the user is offline then push notification fire kindly help in this. Think Out of the Box -- 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/2232

2 2

[kamailio/kamailio] Sending OPTIONS using uac module fails after first attempt in a NATed scenario (#2231)
by Supreeth Herle 26 Feb '20

26 Feb '20

### Setup Description + Problem Description I am running a open5gs (4G Core network) in an OpenStack VM with internal IP 10.4.128.6 and Floating IP 172.24.15.10 and entire (Kamailio IMS + FoHSS) system in another OpenStack VM with internal IP 10.4.128.21 and Floating IP 172.24.15.30. eNB (srslte) is running on a physical machine with IP 192.168.49.125. Kamailio is built from the sources using the forked repo in this [link](https://github.com/herlesupreeth/kamailio/tree/5.3). This forked repo has a fix for handling IMS registration when 4G Core Network is behind a NAT among other fixes. IMS config files - [Kamailio_IMS_Config.zip](https://github.com/kamailio/kamailio/files/4255538… PCSCF, SCSCF, ICSCF are run as separate systemctl process LTE UEs are configured with two APNs - "internet" APN for best effort traffic - IP range 192.168.100.0/24 - "ims" APN for IMS - IP range 192.168.101.0/24. Upon performing the IMS registration, uac module is being used to achieve NATPING by sending OPTIONS message as per the PCSCF script. However, I observe a strange behaviour where the first OPTIONS message sent by the PCSCF is replied with 200 OK and the subsequent message times out with 408 (most of the times even the first OPTIONS message does'nt gets a 200 OK) !!! IMPORTANT NOTE !! This behaviour is not seen if I run the 4G Core Network and Kamailio IMS + FoHSS is run in a single VM i.e. CN not behind a NAT #### Reproduction Upon performing the IMS registration, uac module is being used to achieve NATPING by sending OPTIONS message as per the PCSCF script. However, I observe a strange behaviour where the first OPTIONS message sent by the PCSCF is replied with 200 OK and the subsequent message times out with 408 (most of the times even the first OPTIONS message does'nt gets a 200 OK) #### Debugging Data PCAP at eNB machine and VM running (Kamailio IMS + FoHSS) attached below - [pcaps.zip](https://github.com/kamailio/kamailio/files/4255628/pcaps.zip) #### Log Messages Since the log message from PCSCF, SCSCF and ICSCF is too long I am attaching it as file below. Following is the log from journalctl for PCSCF, SCSCF and ICSCF combined [kamailio_log.txt](https://github.com/kamailio/kamailio/files/4255561/kamail… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.2 (x86_64/linux) 842fef flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 842fef compiled on 11:43:39 Feb 26 2020 with gcc 7.4.0 ``` * **Operating System**: ``` NAME="Ubuntu" VERSION="18.04.3 LTS (Bionic Beaver)" ID=ubuntu ID_LIKE=debian PRETTY_NAME="Ubuntu 18.04.3 LTS" VERSION_ID="18.04" HOME_URL="https://www.ubuntu.com/" SUPPORT_URL="https://help.ubuntu.com/" BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" VERSION_CODENAME=bionic UBUNTU_CODENAME=bionic ``` I am not sure where to start looking for debugging this strange behaviour, any hints or pointer would be really helpful. Many thanks in advance. Regards, Supreeth -- 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/2231

2 6

git:master:3d7b3b1e: modules: readme files regenerated - rtjson ... [skip ci]
by Kamailio Dev 26 Feb '20

26 Feb '20

Module: kamailio Branch: master Commit: 3d7b3b1eeace71cc35aead54a5a1e2de42fd8505 URL: https://github.com/kamailio/kamailio/commit/3d7b3b1eeace71cc35aead54a5a1e2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-26T10:46:24+01:00 modules: readme files regenerated - rtjson ... [skip ci] --- Modified: src/modules/rtjson/README --- Diff: https://github.com/kamailio/kamailio/commit/3d7b3b1eeace71cc35aead54a5a1e2d… Patch: https://github.com/kamailio/kamailio/commit/3d7b3b1eeace71cc35aead54a5a1e2d…

1 0

git:master:a2347660: rtjson: fixed the updated example
by Daniel-Constantin Mierla 26 Feb '20

26 Feb '20

Module: kamailio Branch: master Commit: a23476600666d0cf0604a6a7e3212fa5b1223af8 URL: https://github.com/kamailio/kamailio/commit/a23476600666d0cf0604a6a7e3212fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-26T10:38:23+01:00 rtjson: fixed the updated example - included invalid characters for xml text, rendering empty readme --- Modified: src/modules/rtjson/doc/rtjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a23476600666d0cf0604a6a7e3212fa… Patch: https://github.com/kamailio/kamailio/commit/a23476600666d0cf0604a6a7e3212fa… --- diff --git a/src/modules/rtjson/doc/rtjson_admin.xml b/src/modules/rtjson/doc/rtjson_admin.xml index 1492e82d5a..835b520ca4 100644 --- a/src/modules/rtjson/doc/rtjson_admin.xml +++ b/src/modules/rtjson/doc/rtjson_admin.xml @@ -278,54 +278,56 @@ branch_route[OUTGOING] { <example> <title>JSON Routing Structure</title> <programlisting format="linespecific"> +<![CDATA[ ... { - "version": "1.0", - "routing": "serial", - "routes": [ - { - "uri": "sip:bob@b.example.org:5060", - "dst_uri": "sip:192.0.2.1:5060", - "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", - "socket": "udp:192.0.2.20:5060", - "headers": { - "from": { - "display": "Alice", - "uri": "sip:alice@a.example.org" - }, - "to": { - "display": "Bob", - "uri": "sip:bob@b.example.org" - }, - "extra": "X-Hdr-A: abc\r\nX-Hdr-B: bcd\r\n" - }, - "branch_flags": 8, - "fr_timer": 5000, - "fr_inv_timer": 30000 + "version": "1.0", + "routing": "serial", + "routes": [ + { + "uri": "sip:bob@b.example.org:5060", + "dst_uri": "sip:192.0.2.1:5060", + "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", + "socket": "udp:192.0.2.20:5060", + "headers": { + "from": { + "display": "Alice", + "uri": "sip:alice@a.example.org" }, - { - "uri": "sip:bob@b.example.org:5060", - "dst_uri": "sip:192.0.2.10:5060", - "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", - "socket": "udp:192.0.2.20:5060", - "headers": { - "from": { - "display": "Alice", - "uri": "sip:alice@a.example.org" - }, - "to": { - "display": "Bob", - "uri": "sip:bob@b.example.org" - }, - "extra": "P-Asserted-Identity: \u003csip:alice@a.example.org\u003e\r\n" - }, - "branch_flags": 8, - "fr_timer": 5000, - "fr_inv_timer": 30000 + "to": { + "display": "Bob", + "uri": "sip:bob@b.example.org" }, - ] + "extra": "X-Hdr-A: abc\r\nX-Hdr-B: bcd\r\n" + }, + "branch_flags": 8, + "fr_timer": 5000, + "fr_inv_timer": 30000 + }, + { + "uri": "sip:bob@b.example.org:5060", + "dst_uri": "sip:192.0.2.10:5060", + "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", + "socket": "udp:192.0.2.20:5060", + "headers": { + "from": { + "display": "Alice", + "uri": "sip:alice@a.example.org" + }, + "to": { + "display": "Bob", + "uri": "sip:bob@b.example.org" + }, + "extra": "P-Asserted-Identity: <sip:alice@a.example.org>\r\n" + }, + "branch_flags": 8, + "fr_timer": 5000, + "fr_inv_timer": 30000 + }, + ] } ... +]]> </programlisting> </example>

1 0

[kamailio/kamailio] Adding CDR as JSON functionality (#2107)
by Lucian Balaceanu 26 Feb '20

26 Feb '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  These commits create a CDR addressed engine, similar to the one that acc module exports for acc message accounting. Such an engine made an extension module like acc_json possible. This CDR engine is then used in acc_json to write the functionality for logging CDRs in JSON format. I have added functions to the API exported by acc module instead of creating another separate CDR API, as I thought this is cleaner. I only implemented the acc_json logging to syslog (no message queue support yet). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2107 -- Commit Summary -- * acc: adding CDR engine functionality * acc_json: adding CDR as JSON functionality -- File Changes -- M src/modules/acc/acc_api.h (38) M src/modules/acc/acc_cdr.c (41) M src/modules/acc/acc_cdr.h (6) M src/modules/acc/acc_logic.c (10) M src/modules/acc/acc_logic.h (2) M src/modules/acc/acc_mod.c (93) M src/modules/acc_json/acc_json_mod.c (131) M src/modules/acc_json/acc_json_mod.h (4) M src/modules/acc_json/doc/acc_json_admin.xml (54) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2107.patch https://github.com/kamailio/kamailio/pull/2107.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/2107

5 15

[kamailio/kamailio] Error building Kamailio in Gitlab.com cloud environment (#2228)
by Ivan Ribakov 25 Feb '20

25 Feb '20

### Description We're considering migrating our Kamailio-based product to Gitlab and attempted to setup a PoC of a build pipeline using Gitlab's CI capabilities. We used the same Docker build image but ran into some unexpected problems when running `make`. In short, sequence of steps can be summarised like this: ``` # 1. Generating build config files make Q=0 cfg PREFIX=/usr/local LOCALBASE=/usr/local cfg_prefix=/tmp doc_prefix=/tmp modules_dirs=modules group_include=standard 'include_modules=inesrp inkeepalive sanity json sctp htable avpops uac uac_redirect rtimer dialog tls' 'skip_modules=stun sipt rtpproxy auth_diameter msrp qos seas siptrace sipcapture xhttp xhttp_rpc acc_diameter call_control mediaproxy topoh topos nat_traversal sms smsops jsonrpcs ss7ops ctl dmq dmq_usrloc mqueue rtpengine malloc_test mangler nosip blst app_sqlang app_jsdt auth_xkeys cfg_rpc sca sctp evrexec exec sdpops sipdump nathelper path pike' # 2. Since MY_CUSTOM_FLAG variable is custom and is not set by default, injecting it into src/Makefile.defs sed -i 's/C_DEFS=.*/&\n\o011 -DMY_CUSTOM_FLAG \\/' src/Makefile.defs # 3. should succeed make Q=0 ``` At this point we expected build to succeed since it's exactly the same sequence of steps as we have been running for almost a year now, but what we got was build failures due to `MY_CUSTOM_FLAG` not being visible: ``` core/dprint.h:301:19: error: 'MY_CUSTOM_FLAG' undeclared (first use in this function) ``` (we're using patched Kamailio sources so don't get sidetracked by `MY_CUSTOM_FLAG` not being actually present in `core/dprint.h:301`) Although clues seem to be pointing in the direction of new cloud CI environment being the culprit, we're not really sure how to approach this issue and where to start debugging from. Any suggestions? ### Troubleshooting #### Reproduction  For the record, [here is the Gitlab ticket](https://gitlab.com/gitlab-org/gitlab/issues/198551#note_293261974) with further reproduction details and examples of successful and failing builds ### Additional Information * **Kamailio Version** - output of `kamailio -v` Running the code from this repo's `5.1` branch: `git checkout -b 5.1 origin/5.1` * **Operating System**:  Official Docker `centos:7` image -- 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/2228

4 5

[kamailio/kamailio] update example using IP address reserved for documentation (#2230)
by Mathias WOLFF 25 Feb '20

25 Feb '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2230 -- Commit Summary -- * update example using IP address reserved for documentation -- File Changes -- M src/modules/rtjson/doc/rtjson_admin.xml (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2230.patch https://github.com/kamailio/kamailio/pull/2230.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/2230

2 3

git:master:8bbb97d1: modules: readme files regenerated - rtjson ... [skip ci]
by Kamailio Dev 25 Feb '20

25 Feb '20

Module: kamailio Branch: master Commit: 8bbb97d152d45deff483a77dc869f82858fc6fcc URL: https://github.com/kamailio/kamailio/commit/8bbb97d152d45deff483a77dc869f82… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-25T20:46:08+01:00 modules: readme files regenerated - rtjson ... [skip ci] --- Modified: src/modules/rtjson/README --- Diff: https://github.com/kamailio/kamailio/commit/8bbb97d152d45deff483a77dc869f82… Patch: https://github.com/kamailio/kamailio/commit/8bbb97d152d45deff483a77dc869f82…

1 0

git:master:abecca7f: update example using IP address reserved for documentation
by Henning Westerholt 25 Feb '20

25 Feb '20

Module: kamailio Branch: master Commit: abecca7f6515a454b3394ec0df7f535a6a52e1e9 URL: https://github.com/kamailio/kamailio/commit/abecca7f6515a454b3394ec0df7f535… Author: Mathias WOLFF <mathias(a)celea.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-25T20:37:57+01:00 update example using IP address reserved for documentation --- Modified: src/modules/rtjson/doc/rtjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/abecca7f6515a454b3394ec0df7f535… Patch: https://github.com/kamailio/kamailio/commit/abecca7f6515a454b3394ec0df7f535… --- diff --git a/src/modules/rtjson/doc/rtjson_admin.xml b/src/modules/rtjson/doc/rtjson_admin.xml index e2240f03f3..1492e82d5a 100644 --- a/src/modules/rtjson/doc/rtjson_admin.xml +++ b/src/modules/rtjson/doc/rtjson_admin.xml @@ -280,50 +280,50 @@ branch_route[OUTGOING] { <programlisting format="linespecific"> ... { - "version": "1.0", - "routing": "serial", - "routes": [ - { - "uri": "sip:127.0.0.1:5080", - "dst_uri": "sip:127.0.0.1:5082", - "path": "<sip:127.0.0.1:5084>, <sip:127.0.0.1:5086>", - "socket": "udp:127.0.0.1:5060", - "headers": { - "from": { - "display": "Alice", - "uri": "sip:alice@127.0.0.1" - }, - "to": { - "display": "Alice", - "uri": "sip:alice@127.0.0.1" - }, - "extra": "X-Hdr-A: abc\r\nX-Hdr-B: bcd\r\n" - }, - "branch_flags": 8, - "fr_timer": 5000, - "fr_inv_timer": 30000 - }, - { - "uri": "sip:127.0.0.1:5080", - "dst_uri": "sip:127.0.0.1:5082", - "path": "<sip:127.0.0.1:5084>, <sip:127.0.0.1:5086>", - "socket": "udp:127.0.0.1:5060", - "headers": { - "from": { - "display": "Alice", - "uri": "sip:alice@127.0.0.1" - }, - "to": { - "display": "Alice", - "uri": "sip:alice@127.0.0.1" - }, - "extra": "X-Hdr-A: abc\r\nX-Hdr-B: bcd\r\n" - }, - "branch_flags": 8, - "fr_timer": 5000, - "fr_inv_timer": 30000 - } - ] + "version": "1.0", + "routing": "serial", + "routes": [ + { + "uri": "sip:bob@b.example.org:5060", + "dst_uri": "sip:192.0.2.1:5060", + "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", + "socket": "udp:192.0.2.20:5060", + "headers": { + "from": { + "display": "Alice", + "uri": "sip:alice@a.example.org" + }, + "to": { + "display": "Bob", + "uri": "sip:bob@b.example.org" + }, + "extra": "X-Hdr-A: abc\r\nX-Hdr-B: bcd\r\n" + }, + "branch_flags": 8, + "fr_timer": 5000, + "fr_inv_timer": 30000 + }, + { + "uri": "sip:bob@b.example.org:5060", + "dst_uri": "sip:192.0.2.10:5060", + "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", + "socket": "udp:192.0.2.20:5060", + "headers": { + "from": { + "display": "Alice", + "uri": "sip:alice@a.example.org" + }, + "to": { + "display": "Bob", + "uri": "sip:bob@b.example.org" + }, + "extra": "P-Asserted-Identity: \u003csip:alice@a.example.org\u003e\r\n" + }, + "branch_flags": 8, + "fr_timer": 5000, + "fr_inv_timer": 30000 + }, + ] } ... </programlisting>

1 0

kamcli postgres support
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Hello, anyone in the community with Python knowledge using Postgres that can spend a bit of time to add support in kamcli? * https://github.com/kamailio/kamcli It should be mainly about the content of the code corresponding to db subcommand: * https://github.com/kamailio/kamcli/blob/master/kamcli/commands/cmd_db.py The target for it is to replace kamdbctl and has some command line variants for couple of its functions, now being implemented for MySQL. The rest of the code relies on sqlalchemy, which should have transparent support for both mysql and postgress (even more). Testing the other commands connecting to database with postgres would be good, though. With more and more diversity in the default shell by main Linux/Unix distros, we hope to be able to replace in the near future the kamctl and kamdbctl tools, which are more like bash scripting (a few issue being reported and fixed lately). Besides that, using python allows better input/parameter checking/validation as well as more options for formatted output. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 9-11, 2020, Berlin - www.asipto.com Kamailio World Conference - April 27-29, 2020, in Berlin -- www.kamailioworld.com

1 1

git:5.3:467354de: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 467354de17c83b6c47d06e020060a0bf788c2d39 URL: https://github.com/kamailio/kamailio/commit/467354de17c83b6c47d06e020060a0b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-25T08:46:32+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/467354de17c83b6c47d06e020060a0b… Patch: https://github.com/kamailio/kamailio/commit/467354de17c83b6c47d06e020060a0b… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index e1d2e082c7..29f3ac0811 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2204,7 +2204,7 @@ rtpengine_query(); 5.7. rtpengine_manage([flags]) - Manage the RTPProxy session - it combines the functionality of + Manage the RTPEngine session - it combines the functionality of rtpengine_offer(), rtpengine_answer() and rtpengine_delete(), detecting internally based on message type and method which one to execute. @@ -2223,7 +2223,9 @@ rtpengine_query(); resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpengine_manage() in the route block of t_continue() does - the same as in failure_route). + the same as in failure_route; use a branch route to engage + rtpengine for a forwarded branch after resuming the transaction). + * It does nothing if used inside event_route[tm:branch-failure:...] * If reply to INVITE with code >= 300 do rtpengine_delete() * If reply with SDP to INVITE having code 1xx and 2xx, then do rtpengine_answer() if the request had SDP or tm is not loaded, diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README index ea6fe92e3a..a3bd709124 100644 --- a/src/modules/rtpproxy/README +++ b/src/modules/rtpproxy/README @@ -636,7 +636,9 @@ rtpproxy_destroy(); resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpproxy_manage() in the route block of t_continue() does - the same as in failure_route). + the same as in failure_route; use a branch route to engage + rtpengine for a forwarded branch after resuming the transaction). + * It does nothing if used inside event_route[tm:branch-failure:...] * If reply to INVITE with code >= 300 do unforce_rtpproxy() * If reply with SDP to INVITE having code 1xx and 2xx, then do rtpproxy_answer() if the request had SDP or tm is not loaded,

1 0

git:5.3:35cd520b: auth: safety check for auth header pointer in pv_auth_check()
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 35cd520bfe29d63555aebf64717f602948773280 URL: https://github.com/kamailio/kamailio/commit/35cd520bfe29d63555aebf64717f602… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:41:01+01:00 auth: safety check for auth header pointer in pv_auth_check() (cherry picked from commit ea2ea2f8274eda9d8d7055b22fab8910cd773a19) --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35cd520bfe29d63555aebf64717f602… Patch: https://github.com/kamailio/kamailio/commit/35cd520bfe29d63555aebf64717f602… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index b77be70b76..f9b7097c14 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -744,6 +744,13 @@ static int pv_auth_check(sip_msg_t *msg, str *srealm, str *spasswd, int vflags, if(ret==AUTH_OK && (vchecks&AUTH_CHECK_ID_F)) { hdr = (msg->proxy_auth==0)?msg->authorization:msg->proxy_auth; + if(hdr==NULL) { + if (msg->REQ_METHOD & (METHOD_ACK|METHOD_CANCEL|METHOD_PRACK)) { + return AUTH_OK; + } else { + return AUTH_ERROR; + } + } suser = ((auth_body_t*)(hdr->parsed))->digest.username.user; if((furi=parse_from_uri(msg))==NULL)

1 0

git:5.3:e9f20919: dmq: use PROC_RPC rank to init the worker process
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: e9f20919f1e0b4a396d771255ce86a4e2f9a29c8 URL: https://github.com/kamailio/kamailio/commit/e9f20919f1e0b4a396d771255ce86a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:41:11+01:00 dmq: use PROC_RPC rank to init the worker process (cherry picked from commit f2a4fd419c27b99ce4ff6f93dc3f235d4f74a33c) --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e9f20919f1e0b4a396d771255ce86a4… Patch: https://github.com/kamailio/kamailio/commit/e9f20919f1e0b4a396d771255ce86a4… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index ebfa021119..9414e94e84 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -280,7 +280,7 @@ static int child_init(int rank) for(i = 0; i < num_workers; i++) { init_worker(&workers[i]); LM_DBG("starting worker process %d\n", i); - newpid = fork_process(PROC_NOCHLDINIT, "DMQ WORKER", 0); + newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); if(newpid < 0) { LM_ERR("failed to form process\n"); return -1;

1 0

git:5.3:c8eb4f7a: rtpproxy: docs updated for rtpproxy_manage()
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: c8eb4f7a3e875cfb363a4167fdfa66f381b2f4ba URL: https://github.com/kamailio/kamailio/commit/c8eb4f7a3e875cfb363a4167fdfa66f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:40:27+01:00 rtpproxy: docs updated for rtpproxy_manage() (cherry picked from commit b15362ec487d14b2a428dabbcce4f3de4cf1fc59) --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c8eb4f7a3e875cfb363a4167fdfa66f… Patch: https://github.com/kamailio/kamailio/commit/c8eb4f7a3e875cfb363a4167fdfa66f… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 203f280f90..536d7c6d0a 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -685,7 +685,14 @@ rtpproxy_destroy(); this function after resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpproxy_manage() in the route block of - t_continue() does the same as in failure_route). + t_continue() does the same as in failure_route; use a branch route + to engage rtpengine for a forwarded branch after resuming the + transaction). + </para> + </listitem> + <listitem> + <para> + It does nothing if used inside event_route[tm:branch-failure:...] </para> </listitem> <listitem>

1 0

git:5.3:64c92f2b: usrloc: log database table if use_table() fails
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 64c92f2bbb9739725256d0b6dd5ceb47fe2688ea URL: https://github.com/kamailio/kamailio/commit/64c92f2bbb9739725256d0b6dd5ceb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:40:51+01:00 usrloc: log database table if use_table() fails (cherry picked from commit 3843ae18599bfc1806ccb62df44bbc8ad41d60dd) --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/64c92f2bbb9739725256d0b6dd5ceb4… Patch: https://github.com/kamailio/kamailio/commit/64c92f2bbb9739725256d0b6dd5ceb4… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index fe04d2af3d..45ab20f728 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -666,7 +666,13 @@ int db_insert_ucontact(ucontact_t* _c) } if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { - LM_ERR("sql use_table failed\n"); + if(_c->domain) { + LM_ERR("sql use_table failed for: %.*s\n", + (_c->domain->s)?_c->domain->len:0, + (_c->domain->s)?_c->domain->s:""); + } else { + LM_ERR("sql use_table failed - null\n"); + } return -1; }

1 0

git:5.3:855acfc6: rtpproxy: do nothing in rtpproxy_manage() when used in event_route[tm:branch-failure:...]
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 855acfc670bc814a9d42c5c2a6fdfc19bb93e99a URL: https://github.com/kamailio/kamailio/commit/855acfc670bc814a9d42c5c2a6fdfc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:39:35+01:00 rtpproxy: do nothing in rtpproxy_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations (cherry picked from commit 4305c501128a0d37453a39795bd00314d7f60e4f) --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/855acfc670bc814a9d42c5c2a6fdfc1… Patch: https://github.com/kamailio/kamailio/commit/855acfc670bc814a9d42c5c2a6fdfc1… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 972c6b1148..8aef20019f 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1814,9 +1814,14 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) int method; int nosdp; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) - || (msg->cseq==NULL))) - { + || (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -1831,8 +1836,7 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(method==METHOD_CANCEL || method==METHOD_BYE) return unforce_rtp_proxy(msg, flags); - if(ip==NULL) - { + if(ip==NULL) { cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); }

1 0

git:5.3:8922f773: rtpengine: docs updated for rtpengine_manage()
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 8922f7733e49c3bf39df0846ae2d1c74668b0e4f URL: https://github.com/kamailio/kamailio/commit/8922f7733e49c3bf39df0846ae2d1c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:40:16+01:00 rtpengine: docs updated for rtpengine_manage() (cherry picked from commit bdba22bb9b573c7b32a7de45154f9159c725715f) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8922f7733e49c3bf39df0846ae2d1c7… Patch: https://github.com/kamailio/kamailio/commit/8922f7733e49c3bf39df0846ae2d1c7… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 367d9bf7f9..d4cd2e4fc1 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2560,7 +2560,7 @@ rtpengine_query(); <function moreinfo="none">rtpengine_manage([flags])</function> </title> <para> - Manage the RTPProxy session - it combines the functionality of + Manage the RTPEngine session - it combines the functionality of rtpengine_offer(), rtpengine_answer() and rtpengine_delete(), detecting internally based on message type and method which one to execute. </para> @@ -2597,7 +2597,14 @@ rtpengine_query(); this function after resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpengine_manage() in the route block of - t_continue() does the same as in failure_route). + t_continue() does the same as in failure_route; use a branch route + to engage rtpengine for a forwarded branch after resuming the + transaction). + </para> + </listitem> + <listitem> + <para> + It does nothing if used inside event_route[tm:branch-failure:...] </para> </listitem> <listitem>

1 0

git:5.3:289e35cf: rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...]
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 289e35cff83aa0fd4fc7123e26c18dce9053bb03 URL: https://github.com/kamailio/kamailio/commit/289e35cff83aa0fd4fc7123e26c18dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:39:22+01:00 rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations (cherry picked from commit 387de23a5c9252ee8409d378ea452bfd52e416d4) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/289e35cff83aa0fd4fc7123e26c18dc… Patch: https://github.com/kamailio/kamailio/commit/289e35cff83aa0fd4fc7123e26c18dc… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 4435825a3f..20df725d2e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3589,9 +3589,14 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) int nosdp; tm_cell_t *t = NULL; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if (msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || - (msg->cseq==NULL))) - { + (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -3599,7 +3604,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) method = get_cseq(msg)->method_id; if (!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + || method==METHOD_BYE || method==METHOD_UPDATE)) return -1; if (method==METHOD_CANCEL || method==METHOD_BYE)

1 0

git:5.3:ec02a63f: topos: skip http reply handling
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: ec02a63f63780d538b5f766d720df1208c2b98af URL: https://github.com/kamailio/kamailio/commit/ec02a63f63780d538b5f766d720df12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:38:55+01:00 topos: skip http reply handling (cherry picked from commit fad795648f8cbf12cc099dea18092ff7beee9c75) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec02a63f63780d538b5f766d720df12… Patch: https://github.com/kamailio/kamailio/commit/ec02a63f63780d538b5f766d720df12… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index fa70d06bb9..d698b90cc1 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -269,8 +269,13 @@ int tps_prepare_msg(sip_msg_t *msg) LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { - LM_DBG("non sip message\n"); + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { + LM_DBG("unknown sip message type %d\n", msg->first_line.type); return 1; }

1 0

git:5.3:83357250: topoh: skip http reply handling
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 833572502f016f6be83eaa7f7317ac7e0f154039 URL: https://github.com/kamailio/kamailio/commit/833572502f016f6be83eaa7f7317ac7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:39:11+01:00 topoh: skip http reply handling (cherry picked from commit 345d6f67006e4254300209742a2778b925cafaf7) --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/833572502f016f6be83eaa7f7317ac7… Patch: https://github.com/kamailio/kamailio/commit/833572502f016f6be83eaa7f7317ac7… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 0eb5345598..b4c3649f3b 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -249,8 +249,14 @@ int th_prepare_msg(sip_msg_t *msg) LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { - LM_DBG("non sip message\n"); + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) + { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { + LM_DBG("unknown sip message type %d\n", msg->first_line.type); return 1; }

1 0

git:master:f2a4fd41: dmq: use PROC_RPC rank to init the worker process
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: master Commit: f2a4fd419c27b99ce4ff6f93dc3f235d4f74a33c URL: https://github.com/kamailio/kamailio/commit/f2a4fd419c27b99ce4ff6f93dc3f235… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:36:40+01:00 dmq: use PROC_RPC rank to init the worker process --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/f2a4fd419c27b99ce4ff6f93dc3f235… Patch: https://github.com/kamailio/kamailio/commit/f2a4fd419c27b99ce4ff6f93dc3f235… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index ebfa021119..9414e94e84 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -280,7 +280,7 @@ static int child_init(int rank) for(i = 0; i < num_workers; i++) { init_worker(&workers[i]); LM_DBG("starting worker process %d\n", i); - newpid = fork_process(PROC_NOCHLDINIT, "DMQ WORKER", 0); + newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); if(newpid < 0) { LM_ERR("failed to form process\n"); return -1;

1 0

git:master:ea2ea2f8: auth: safety check for auth header pointer in pv_auth_check()
by Daniel-Constantin Mierla 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: ea2ea2f8274eda9d8d7055b22fab8910cd773a19 URL: https://github.com/kamailio/kamailio/commit/ea2ea2f8274eda9d8d7055b22fab891… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-24T20:27:14+01:00 auth: safety check for auth header pointer in pv_auth_check() --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ea2ea2f8274eda9d8d7055b22fab891… Patch: https://github.com/kamailio/kamailio/commit/ea2ea2f8274eda9d8d7055b22fab891… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index b77be70b76..f9b7097c14 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -744,6 +744,13 @@ static int pv_auth_check(sip_msg_t *msg, str *srealm, str *spasswd, int vflags, if(ret==AUTH_OK && (vchecks&AUTH_CHECK_ID_F)) { hdr = (msg->proxy_auth==0)?msg->authorization:msg->proxy_auth; + if(hdr==NULL) { + if (msg->REQ_METHOD & (METHOD_ACK|METHOD_CANCEL|METHOD_PRACK)) { + return AUTH_OK; + } else { + return AUTH_ERROR; + } + } suser = ((auth_body_t*)(hdr->parsed))->digest.username.user; if((furi=parse_from_uri(msg))==NULL)

1 0

[kamailio/kamailio] rtpengine: rtpengine_manage does offer instead of delete in event_route[tm:branch-failure:id] (#2222)
by George Diamantopoulos 24 Feb '20

24 Feb '20

### Description When called from within an event_route[tm:branch-failure:id], rtpengine_manage() will do an offer instead of a delete, resulting in duplicated sdp lines in body. Is this an omission or is it intentional?  ### Troubleshooting #### Reproduction ``` event_route[tm:branch-failure:DISPATCH_PROVIDER_FAILOVER] { rtpengine_manage("trust-address replace-origin replace-session-connection"); # next DST - only for 5xx or local timeout if ( t_check_status("5[[:digit:]]+") || (t_branch_timeout() && !t_branch_replied()) ) { if ( ds_next_dst() ) { xlog("L_NOTICE", "--- SCRIPT_DISPATCH_PROVIDER_FAILOVER: A failover destination was selected: Forwarding to $du\n"); t_on_branch("PROVIDER_BRANCH"); t_on_branch_failure("DISPATCH_PROVIDER_FAILOVER"); t_on_failure("NEXT_PROVIDER"); route(RELAY); exit; } else { xlog("L_NOTICE", "--- DISPATCH_PROVIDER_FAILOVER: PROVIDER DOWN! Failed to route request to provider! Giving Up. Negative response will be sent upstream.\n"); } } } ```  ### Possible Solutions Explicitly use rtpengine_delete() instead.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, 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 8.3.0 ``` * **Operating System**:  ``` Debian 10.3 Linux #1 SMP Debian 4.19.67-2+deb10u2 (2019-11-11) 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/2222

2 4

[kamailio/kamailio] update example using IP address reserved for documentation (#2229)
by Mathias WOLFF 24 Feb '20

24 Feb '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2229 -- Commit Summary -- * update example using IP address reserved for documentation -- File Changes -- M src/modules/rtjson/README (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2229.patch https://github.com/kamailio/kamailio/pull/2229.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/2229

1 1

[kamailio/kamailio] core: log parser error messages with debug level (#2226)
by Nuno Ferreira 24 Feb '20

24 Feb '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description * Make parser error logs as debug avoiding excessive logging for negative HTTP replies. The issue was discussed here: https://lists.kamailio.org/pipermail/sr-users/2020-February/108232.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2226 -- Commit Summary -- * Merge branch 'master' of github.com:nferreyra/kamailio * Merge remote-tracking branch 'upstream/master' * Merge remote-tracking branch 'upstream/master' * core: log parser error messages with debug level -- File Changes -- M src/core/parser/msg_parser.c (2) M src/core/parser/parse_fline.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2226.patch https://github.com/kamailio/kamailio/pull/2226.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/2226

3 5

git:master:3843ae18: usrloc: log database table if use_table() fails
by Daniel-Constantin Mierla 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: 3843ae18599bfc1806ccb62df44bbc8ad41d60dd URL: https://github.com/kamailio/kamailio/commit/3843ae18599bfc1806ccb62df44bbc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-24T10:32:17+01:00 usrloc: log database table if use_table() fails --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/3843ae18599bfc1806ccb62df44bbc8… Patch: https://github.com/kamailio/kamailio/commit/3843ae18599bfc1806ccb62df44bbc8… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index c95cbb0dd7..8c65063784 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -666,7 +666,13 @@ int db_insert_ucontact(ucontact_t* _c) } if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { - LM_ERR("sql use_table failed\n"); + if(_c->domain) { + LM_ERR("sql use_table failed for: %.*s\n", + (_c->domain->s)?_c->domain->len:0, + (_c->domain->s)?_c->domain->s:""); + } else { + LM_ERR("sql use_table failed - null\n"); + } return -1; }

1 0

git:5.3:b35c2ce5: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Feb '20

24 Feb '20

Module: kamailio Branch: 5.3 Commit: b35c2ce5969e018884f5ef536cab71918a2027dd URL: https://github.com/kamailio/kamailio/commit/b35c2ce5969e018884f5ef536cab719… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-24T09:46:18+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/b35c2ce5969e018884f5ef536cab719… Patch: https://github.com/kamailio/kamailio/commit/b35c2ce5969e018884f5ef536cab719… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index 124b1c1041..cb659bdf75 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -55,6 +55,11 @@ Lucian Balaceanu 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 6. Configuration examples 7. Installation and Running @@ -194,6 +199,11 @@ Chapter 1. Admin Guide 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 6. Configuration examples 7. Installation and Running @@ -632,6 +642,11 @@ dstavp) 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 5.1. cr.reload_routes @@ -658,6 +673,75 @@ dstavp) Parameters: * none +5.3. cr.add_host + + This command adds a new host to the route rules + + Name: cr.add_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.add_host -- '-h test.domain.com:5060 -d proxy -p null -w + 0.1' + +5.4. cr.delete_host + + This command deletes a host from the route rules + + Name: cr.delete_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.delete_host -- '-h test.domain.com:5060 -d proxy -p null' + +5.5. cr.activate_host + + This command activates a host from the route rules + + Name: cr.activate_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.activate_host -- '-h test.domain.com:5060 -d proxy -p + null' + +5.6. cr.deactivate_host + + This command deactivates a host from the route rules + + Name: cr.deactivate_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.deactivate_host -- '-h test.domain.com:5060 -d proxy -p + null' + +5.7. cr.replace_host + + This command replaces a host from the route rules + + Name: cr.replace_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.replace_host -- '-h test1.domain.com:5060 -d proxy -t + test2.domain.com:5060' + 6. Configuration examples Example 1.14. Configuration example - Routing to default tree @@ -1128,7 +1212,7 @@ modparam("carrierroute", "carrierroute_rewrite_suffix_col", "rewrite_suffix") 14. carrierroute_description_col (string) A comment for the route entry, useful for larger routing tables. The - comment is also displayed by the fifo cmd "cr_dump_routes". + comment is also displayed by the rpc cmd "cr.dump_routes". Example 2.14. Set carrierroute_description_col parameter ...

1 0

git:5.3:3e94d214: carrierroute: remove mi fifo files
by Stefan Mititelu 24 Feb '20

24 Feb '20

Module: kamailio Branch: 5.3 Commit: 3e94d214bd9361d452c575954fc739b7bb6d3908 URL: https://github.com/kamailio/kamailio/commit/3e94d214bd9361d452c575954fc739b… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-24T10:27:56+02:00 carrierroute: remove mi fifo files (cherry picked from commit 18c415f27ed9a914615a95c1d648ec2677ea13f1) --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/doc/carrierroute_db.xml Removed: src/modules/carrierroute/cr_fifo.c Removed: src/modules/carrierroute/cr_fifo.h --- Diff: https://github.com/kamailio/kamailio/commit/3e94d214bd9361d452c575954fc739b… Patch: https://github.com/kamailio/kamailio/commit/3e94d214bd9361d452c575954fc739b…

1 0

git:5.3:f7e481ac: carrierroute: update doc for the new rpc commands
by Stefan Mititelu 24 Feb '20

24 Feb '20

Module: kamailio Branch: 5.3 Commit: f7e481ac613c0cbc49516d579cf3dd6c9ff9aa21 URL: https://github.com/kamailio/kamailio/commit/f7e481ac613c0cbc49516d579cf3dd6… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-24T10:27:56+02:00 carrierroute: update doc for the new rpc commands (cherry picked from commit 7647046384883f3506ec2321794f2b2e95032146) --- Modified: src/modules/carrierroute/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7e481ac613c0cbc49516d579cf3dd6… Patch: https://github.com/kamailio/kamailio/commit/f7e481ac613c0cbc49516d579cf3dd6…

1 0

git:5.3:8ca1b7c3: carrierroute: add new rpc commands
by Stefan Mititelu 24 Feb '20

24 Feb '20

Module: kamailio Branch: 5.3 Commit: 8ca1b7c325bcfe27f1d5fb71f42bf1ea92a5b408 URL: https://github.com/kamailio/kamailio/commit/8ca1b7c325bcfe27f1d5fb71f42bf1e… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-24T10:27:56+02:00 carrierroute: add new rpc commands - add cr.add_host command - add cr.delete_host command (cherry picked from commit dd186700b6c7a62a19ddde15f3d367bc48a0aa29) --- Modified: src/modules/carrierroute/cr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8ca1b7c325bcfe27f1d5fb71f42bf1e… Patch: https://github.com/kamailio/kamailio/commit/8ca1b7c325bcfe27f1d5fb71f42bf1e… --- diff --git a/src/modules/carrierroute/cr_rpc.c b/src/modules/carrierroute/cr_rpc.c index cf86ae7830..8979d25e8b 100644 --- a/src/modules/carrierroute/cr_rpc.c +++ b/src/modules/carrierroute/cr_rpc.c @@ -164,8 +164,6 @@ static const char *cr_rpc_dump_routes_doc[2] = { }; - - static void cr_rpc_activate_host(rpc_t *rpc, void *ctx) { int ret; str argument; @@ -245,6 +243,79 @@ static const char *cr_rpc_deactivate_host_doc[2] = { +static void cr_rpc_add_host(rpc_t *rpc, void *ctx) { + int ret; + str argument; + rpc_opt_t options; + + if (mode != CARRIERROUTE_MODE_FILE) { + rpc->fault(ctx, 500, "Not running in config file mode, cannot modify route from command line"); + return; + } + + if (rpc->scan(ctx, "S", &argument) < 1) { + rpc->fault(ctx, 500, "Get argument failed"); + return; + } + + if ((ret = get_rpc_opts(&argument, &options, opt_settings[OPT_ADD])) < 0) { + rpc->fault(ctx, 500, "Get options failed"); + return; + } + + options.status = 1; + options.cmd = OPT_ADD; + + if (update_route_data(&options) < 0) { + rpc->fault(ctx, 500, "Update options failed"); + return; + } + + rpc->add(ctx, "s", "200 ok"); + return; +} + +static const char *cr_rpc_add_host_doc[2] = { + "Add carrierroute host", 0 +}; + + + +static void cr_rpc_delete_host(rpc_t *rpc, void *ctx) { + int ret; + str argument; + rpc_opt_t options; + + if (mode != CARRIERROUTE_MODE_FILE) { + rpc->fault(ctx, 500, "Not running in config file mode, cannot modify route from command line"); + return; + } + + if (rpc->scan(ctx, "S", &argument) < 1) { + rpc->fault(ctx, 500, "Get argument failed"); + return; + } + + if ((ret = get_rpc_opts(&argument, &options, opt_settings[OPT_REMOVE])) < 0) { + rpc->fault(ctx, 500, "Get options failed"); + return; + } + + options.cmd = OPT_REMOVE; + + if (update_route_data(&options) < 0) { + rpc->fault(ctx, 500, "Update options failed"); + return; + } + + rpc->add(ctx, "s", "200 ok"); + return; +} + +static const char *cr_rpc_delete_host_doc[2] = { + "Remove carrierroute host", 0 +}; + static void cr_rpc_replace_host(rpc_t *rpc, void *ctx) { int ret; @@ -291,6 +362,8 @@ rpc_export_t cr_rpc_methods[] = { {"cr.dump_routes", cr_rpc_dump_routes, cr_rpc_dump_routes_doc, 0}, {"cr.activate_host", cr_rpc_activate_host, cr_rpc_activate_host_doc, 0}, {"cr.deactivate_host", cr_rpc_deactivate_host, cr_rpc_deactivate_host_doc, 0}, + {"cr.add_host", cr_rpc_add_host, cr_rpc_add_host_doc, 0}, + {"cr.delete_host", cr_rpc_delete_host, cr_rpc_delete_host_doc, 0}, {"cr.replace_host", cr_rpc_replace_host, cr_rpc_replace_host_doc, 0}, {0, 0, 0, 0} };

1 0

git:5.3:2786033f: carrierroute: organize and add new rpc commands
by Stefan Mititelu 24 Feb '20

24 Feb '20

Module: kamailio Branch: 5.3 Commit: 2786033fa978f3059541ef6aee03c53ea570f485 URL: https://github.com/kamailio/kamailio/commit/2786033fa978f3059541ef6aee03c53… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-24T10:27:48+02:00 carrierroute: organize and add new rpc commands - organize helper commands from deprecated MI FIFO - add cr.activate_host command - add cr.deactivate_host command - add cr.replace_host command (cherry picked from commit 4c7896fa7f0294fb33d918c7e528871d5969daaf) --- Added: src/modules/carrierroute/cr_rpc.c Added: src/modules/carrierroute/cr_rpc.h Added: src/modules/carrierroute/cr_rpc_helper.c Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/2786033fa978f3059541ef6aee03c53… Patch: https://github.com/kamailio/kamailio/commit/2786033fa978f3059541ef6aee03c53…

1 0

git:master:150252e7: core: kemi - convenience function KS.is_proto() to test many transport protos
by Daniel-Constantin Mierla 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: 150252e785d48e051de8640a1bbfa8a2f1a34553 URL: https://github.com/kamailio/kamailio/commit/150252e785d48e051de8640a1bbfa8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-24T09:31:39+01:00 core: kemi - convenience function KS.is_proto() to test many transport protos --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/150252e785d48e051de8640a1bbfa8a… Patch: https://github.com/kamailio/kamailio/commit/150252e785d48e051de8640a1bbfa8a… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 612e980734..8b5663a39f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1105,6 +1105,59 @@ static int sr_kemi_core_is_proto_sctp(sip_msg_t *msg) return (msg->rcv.proto == PROTO_SCTP)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_is_proto(sip_msg_t *msg, str *sproto) +{ + int i; + if (msg==NULL || sproto==NULL || sproto->s==NULL || sproto->len<=0) { + return SR_KEMI_FALSE; + } + for(i=0; i<sproto->len; i++) { + switch(sproto->s[i]) { + case 'e': + case 'E': + if (msg->rcv.proto == PROTO_TLS) { + return SR_KEMI_TRUE; + } + break; + case 's': + case 'S': + if (msg->rcv.proto == PROTO_SCTP) { + return SR_KEMI_TRUE; + } + break; + case 't': + case 'T': + if (msg->rcv.proto == PROTO_TCP) { + return SR_KEMI_TRUE; + } + break; + case 'u': + case 'U': + if (msg->rcv.proto == PROTO_UDP) { + return SR_KEMI_TRUE; + } + break; + case 'v': + case 'V': + if (msg->rcv.proto == PROTO_WS) { + return SR_KEMI_TRUE; + } + break; + + case 'w': + case 'W': + if (msg->rcv.proto == PROTO_WSS) { + return SR_KEMI_TRUE; + } + break; + } + } + return SR_KEMI_FALSE; +} + /** * */ @@ -1717,6 +1770,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_proto"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_IPv4"), SR_KEMIP_BOOL, sr_kemi_core_is_af_ipv4, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:91e9835d: kemix: exported get_conid() function to retrieve tcp connection id
by Daniel-Constantin Mierla 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: 91e9835dc751403440b1b8c3d03004b3434fdd45 URL: https://github.com/kamailio/kamailio/commit/91e9835dc751403440b1b8c3d03004b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-24T09:31:39+01:00 kemix: exported get_conid() function to retrieve tcp connection id - returns -1 if not available --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/91e9835dc751403440b1b8c3d03004b… Patch: https://github.com/kamailio/kamailio/commit/91e9835dc751403440b1b8c3d03004b… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index d261766f85..81e433c9e3 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -32,6 +32,7 @@ #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" #include "../../core/parser/digest/digest.h" +#include "../../core/tcp_conn.h" MODULE_VERSION @@ -822,6 +823,25 @@ static sr_kemi_xval_t* ki_kx_get_callid(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static int ki_kx_get_conid(sip_msg_t *msg) +{ + tcp_connection_t *con; + int conid; + + if (msg == NULL) + return -1; + + if ((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) + return -1; + + conid = con->id; + tcpconn_put(con); + + return conid; +} /** * @@ -1058,6 +1078,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_conid"), + SR_KEMIP_INT, ki_kx_get_conid, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:cd3def2d: modules: readme files regenerated - carrierroute ... [skip ci]
by Kamailio Dev 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: cd3def2da2b5a41ef5dac3715c18ad415d5ac218 URL: https://github.com/kamailio/kamailio/commit/cd3def2da2b5a41ef5dac3715c18ad4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-24T09:31:24+01:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/cd3def2da2b5a41ef5dac3715c18ad4… Patch: https://github.com/kamailio/kamailio/commit/cd3def2da2b5a41ef5dac3715c18ad4… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index 124b1c1041..cb659bdf75 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -55,6 +55,11 @@ Lucian Balaceanu 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 6. Configuration examples 7. Installation and Running @@ -194,6 +199,11 @@ Chapter 1. Admin Guide 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 6. Configuration examples 7. Installation and Running @@ -632,6 +642,11 @@ dstavp) 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 5.1. cr.reload_routes @@ -658,6 +673,75 @@ dstavp) Parameters: * none +5.3. cr.add_host + + This command adds a new host to the route rules + + Name: cr.add_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.add_host -- '-h test.domain.com:5060 -d proxy -p null -w + 0.1' + +5.4. cr.delete_host + + This command deletes a host from the route rules + + Name: cr.delete_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.delete_host -- '-h test.domain.com:5060 -d proxy -p null' + +5.5. cr.activate_host + + This command activates a host from the route rules + + Name: cr.activate_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.activate_host -- '-h test.domain.com:5060 -d proxy -p + null' + +5.6. cr.deactivate_host + + This command deactivates a host from the route rules + + Name: cr.deactivate_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.deactivate_host -- '-h test.domain.com:5060 -d proxy -p + null' + +5.7. cr.replace_host + + This command replaces a host from the route rules + + Name: cr.replace_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.replace_host -- '-h test1.domain.com:5060 -d proxy -t + test2.domain.com:5060' + 6. Configuration examples Example 1.14. Configuration example - Routing to default tree @@ -1128,7 +1212,7 @@ modparam("carrierroute", "carrierroute_rewrite_suffix_col", "rewrite_suffix") 14. carrierroute_description_col (string) A comment for the route entry, useful for larger routing tables. The - comment is also displayed by the fifo cmd "cr_dump_routes". + comment is also displayed by the rpc cmd "cr.dump_routes". Example 2.14. Set carrierroute_description_col parameter ...

1 0

git:master:18c415f2: carrierroute: remove mi fifo files
by Stefan Mititelu 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: 18c415f27ed9a914615a95c1d648ec2677ea13f1 URL: https://github.com/kamailio/kamailio/commit/18c415f27ed9a914615a95c1d648ec2… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-02-24T10:16:37+02:00 carrierroute: remove mi fifo files --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/doc/carrierroute_db.xml Removed: src/modules/carrierroute/cr_fifo.c Removed: src/modules/carrierroute/cr_fifo.h --- Diff: https://github.com/kamailio/kamailio/commit/18c415f27ed9a914615a95c1d648ec2… Patch: https://github.com/kamailio/kamailio/commit/18c415f27ed9a914615a95c1d648ec2…

1 0

[kamailio/kamailio] Master rebase (#2225)
by Stefan Mititelu 24 Feb '20

24 Feb '20

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ X ] 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  Hello, what we've done in these commits: - ported corresponding functions from MI fifo to RPC (see cr_rpc.c) - used the helper functions from MI, in RPC (see cr_rpc_helper.c) - updated doc - deleted MI fifo files Hopefully nobody uses the MI commands for this module. Please let me know otherwise, in order to delete the last commit of this PR. Thanks, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2225 -- Commit Summary -- * carrierroute: organize and add new rpc commands * carrierroute: add new rpc commands * carrierroute: update doc for the new rpc commands * carrierroute: remove mi fifo files -- File Changes -- M src/modules/carrierroute/carrierroute.c (50) D src/modules/carrierroute/cr_fifo.c (1243) A src/modules/carrierroute/cr_rpc.c (369) R src/modules/carrierroute/cr_rpc.h (79) A src/modules/carrierroute/cr_rpc_helper.c (589) M src/modules/carrierroute/doc/carrierroute_db.xml (2) M src/modules/carrierroute/doc/rpc.xml (129) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2225.patch https://github.com/kamailio/kamailio/pull/2225.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/2225

3 4

git:master:76470463: carrierroute: update doc for the new rpc commands
by Stefan Mititelu 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: 7647046384883f3506ec2321794f2b2e95032146 URL: https://github.com/kamailio/kamailio/commit/7647046384883f3506ec2321794f2b2… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-02-24T10:16:37+02:00 carrierroute: update doc for the new rpc commands --- Modified: src/modules/carrierroute/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/7647046384883f3506ec2321794f2b2… Patch: https://github.com/kamailio/kamailio/commit/7647046384883f3506ec2321794f2b2…

1 0

git:master:4c7896fa: carrierroute: organize and add new rpc commands
by Stefan Mititelu 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: 4c7896fa7f0294fb33d918c7e528871d5969daaf URL: https://github.com/kamailio/kamailio/commit/4c7896fa7f0294fb33d918c7e528871… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-02-24T10:16:37+02:00 carrierroute: organize and add new rpc commands - organize helper commands from deprecated MI FIFO - add cr.activate_host command - add cr.deactivate_host command - add cr.replace_host command --- Added: src/modules/carrierroute/cr_rpc.c Added: src/modules/carrierroute/cr_rpc.h Added: src/modules/carrierroute/cr_rpc_helper.c Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/4c7896fa7f0294fb33d918c7e528871… Patch: https://github.com/kamailio/kamailio/commit/4c7896fa7f0294fb33d918c7e528871…

1 0

git:master:dd186700: carrierroute: add new rpc commands
by Stefan Mititelu 24 Feb '20

24 Feb '20

Module: kamailio Branch: master Commit: dd186700b6c7a62a19ddde15f3d367bc48a0aa29 URL: https://github.com/kamailio/kamailio/commit/dd186700b6c7a62a19ddde15f3d367b… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-02-24T10:16:37+02:00 carrierroute: add new rpc commands - add cr.add_host command - add cr.delete_host command --- Modified: src/modules/carrierroute/cr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/dd186700b6c7a62a19ddde15f3d367b… Patch: https://github.com/kamailio/kamailio/commit/dd186700b6c7a62a19ddde15f3d367b… --- diff --git a/src/modules/carrierroute/cr_rpc.c b/src/modules/carrierroute/cr_rpc.c index cf86ae7830..8979d25e8b 100644 --- a/src/modules/carrierroute/cr_rpc.c +++ b/src/modules/carrierroute/cr_rpc.c @@ -164,8 +164,6 @@ static const char *cr_rpc_dump_routes_doc[2] = { }; - - static void cr_rpc_activate_host(rpc_t *rpc, void *ctx) { int ret; str argument; @@ -245,6 +243,79 @@ static const char *cr_rpc_deactivate_host_doc[2] = { +static void cr_rpc_add_host(rpc_t *rpc, void *ctx) { + int ret; + str argument; + rpc_opt_t options; + + if (mode != CARRIERROUTE_MODE_FILE) { + rpc->fault(ctx, 500, "Not running in config file mode, cannot modify route from command line"); + return; + } + + if (rpc->scan(ctx, "S", &argument) < 1) { + rpc->fault(ctx, 500, "Get argument failed"); + return; + } + + if ((ret = get_rpc_opts(&argument, &options, opt_settings[OPT_ADD])) < 0) { + rpc->fault(ctx, 500, "Get options failed"); + return; + } + + options.status = 1; + options.cmd = OPT_ADD; + + if (update_route_data(&options) < 0) { + rpc->fault(ctx, 500, "Update options failed"); + return; + } + + rpc->add(ctx, "s", "200 ok"); + return; +} + +static const char *cr_rpc_add_host_doc[2] = { + "Add carrierroute host", 0 +}; + + + +static void cr_rpc_delete_host(rpc_t *rpc, void *ctx) { + int ret; + str argument; + rpc_opt_t options; + + if (mode != CARRIERROUTE_MODE_FILE) { + rpc->fault(ctx, 500, "Not running in config file mode, cannot modify route from command line"); + return; + } + + if (rpc->scan(ctx, "S", &argument) < 1) { + rpc->fault(ctx, 500, "Get argument failed"); + return; + } + + if ((ret = get_rpc_opts(&argument, &options, opt_settings[OPT_REMOVE])) < 0) { + rpc->fault(ctx, 500, "Get options failed"); + return; + } + + options.cmd = OPT_REMOVE; + + if (update_route_data(&options) < 0) { + rpc->fault(ctx, 500, "Update options failed"); + return; + } + + rpc->add(ctx, "s", "200 ok"); + return; +} + +static const char *cr_rpc_delete_host_doc[2] = { + "Remove carrierroute host", 0 +}; + static void cr_rpc_replace_host(rpc_t *rpc, void *ctx) { int ret; @@ -291,6 +362,8 @@ rpc_export_t cr_rpc_methods[] = { {"cr.dump_routes", cr_rpc_dump_routes, cr_rpc_dump_routes_doc, 0}, {"cr.activate_host", cr_rpc_activate_host, cr_rpc_activate_host_doc, 0}, {"cr.deactivate_host", cr_rpc_deactivate_host, cr_rpc_deactivate_host_doc, 0}, + {"cr.add_host", cr_rpc_add_host, cr_rpc_add_host_doc, 0}, + {"cr.delete_host", cr_rpc_delete_host, cr_rpc_delete_host_doc, 0}, {"cr.replace_host", cr_rpc_replace_host, cr_rpc_replace_host_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:10b96696: core: better debug logging in mk_action function
by Henning Westerholt 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: 10b96696b82d2e70c15f3e4bc52097f0a5062499 URL: https://github.com/kamailio/kamailio/commit/10b96696b82d2e70c15f3e4bc52097f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-23T21:45:48+01:00 core: better debug logging in mk_action function --- Modified: src/core/route_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/10b96696b82d2e70c15f3e4bc52097f… Patch: https://github.com/kamailio/kamailio/commit/10b96696b82d2e70c15f3e4bc52097f… --- diff --git a/src/core/route_struct.c b/src/core/route_struct.c index 063e1773aa..51f48a0a6d 100644 --- a/src/core/route_struct.c +++ b/src/core/route_struct.c @@ -125,8 +125,7 @@ struct action* mk_action(enum action_type type, int count, ...) for (i=0; i<a->count; i++) { a->val[i].type = va_arg(args, int); a->val[i].u.data = va_arg(args, void *); - - DBG("ACTION_#%d #%d/%d: %d(%x)/ %p\n", a->type, i, a->count, a->val[i].type, a->val[i].type, a->val[i].u.data); + DBG("ACTION type%d, i/count %d/%d: type %d(%x)/ data %p\n", a->type, i, a->count, a->val[i].type, a->val[i].type, a->val[i].u.data); } va_end(args);

1 0

git:master:3d28b4c3: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: 3d28b4c3fcb2131c0f360487b0d233ed93388aac URL: https://github.com/kamailio/kamailio/commit/3d28b4c3fcb2131c0f360487b0d233e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-23T12:31:14+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/3d28b4c3fcb2131c0f360487b0d233e… Patch: https://github.com/kamailio/kamailio/commit/3d28b4c3fcb2131c0f360487b0d233e… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 67e7b4475f..d6ae750551 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2210,7 +2210,7 @@ rtpengine_query(); 5.7. rtpengine_manage([flags]) - Manage the RTPProxy session - it combines the functionality of + Manage the RTPEngine session - it combines the functionality of rtpengine_offer(), rtpengine_answer() and rtpengine_delete(), detecting internally based on message type and method which one to execute. @@ -2229,7 +2229,9 @@ rtpengine_query(); resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpengine_manage() in the route block of t_continue() does - the same as in failure_route). + the same as in failure_route; use a branch route to engage + rtpengine for a forwarded branch after resuming the transaction). + * It does nothing if used inside event_route[tm:branch-failure:...] * If reply to INVITE with code >= 300 do rtpengine_delete() * If reply with SDP to INVITE having code 1xx and 2xx, then do rtpengine_answer() if the request had SDP or tm is not loaded, diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README index 93cb48b609..c40d15810e 100644 --- a/src/modules/rtpproxy/README +++ b/src/modules/rtpproxy/README @@ -636,7 +636,9 @@ rtpproxy_destroy(); resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpproxy_manage() in the route block of t_continue() does - the same as in failure_route). + the same as in failure_route; use a branch route to engage + rtpengine for a forwarded branch after resuming the transaction). + * It does nothing if used inside event_route[tm:branch-failure:...] * If reply to INVITE with code >= 300 do unforce_rtpproxy() * If reply with SDP to INVITE having code 1xx and 2xx, then do rtpproxy_answer() if the request had SDP or tm is not loaded,

1 0

git:master:b15362ec: rtpproxy: docs updated for rtpproxy_manage()
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: b15362ec487d14b2a428dabbcce4f3de4cf1fc59 URL: https://github.com/kamailio/kamailio/commit/b15362ec487d14b2a428dabbcce4f3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:30:02+01:00 rtpproxy: docs updated for rtpproxy_manage() --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b15362ec487d14b2a428dabbcce4f3d… Patch: https://github.com/kamailio/kamailio/commit/b15362ec487d14b2a428dabbcce4f3d… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 203f280f90..536d7c6d0a 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -685,7 +685,14 @@ rtpproxy_destroy(); this function after resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpproxy_manage() in the route block of - t_continue() does the same as in failure_route). + t_continue() does the same as in failure_route; use a branch route + to engage rtpengine for a forwarded branch after resuming the + transaction). + </para> + </listitem> + <listitem> + <para> + It does nothing if used inside event_route[tm:branch-failure:...] </para> </listitem> <listitem>

1 0

git:master:4305c501: rtpproxy: do nothing in rtpproxy_manage() when used in event_route[tm:branch-failure:...]
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: 4305c501128a0d37453a39795bd00314d7f60e4f URL: https://github.com/kamailio/kamailio/commit/4305c501128a0d37453a39795bd0031… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:22:08+01:00 rtpproxy: do nothing in rtpproxy_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/4305c501128a0d37453a39795bd0031… Patch: https://github.com/kamailio/kamailio/commit/4305c501128a0d37453a39795bd0031… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 972c6b1148..8aef20019f 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1814,9 +1814,14 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) int method; int nosdp; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) - || (msg->cseq==NULL))) - { + || (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -1831,8 +1836,7 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(method==METHOD_CANCEL || method==METHOD_BYE) return unforce_rtp_proxy(msg, flags); - if(ip==NULL) - { + if(ip==NULL) { cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); }

1 0

git:master:bdba22bb: rtpengine: docs updated for rtpengine_manage()
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: bdba22bb9b573c7b32a7de45154f9159c725715f URL: https://github.com/kamailio/kamailio/commit/bdba22bb9b573c7b32a7de45154f915… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:29:44+01:00 rtpengine: docs updated for rtpengine_manage() --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bdba22bb9b573c7b32a7de45154f915… Patch: https://github.com/kamailio/kamailio/commit/bdba22bb9b573c7b32a7de45154f915… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index f4213f2cab..fafff2e4c5 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2564,7 +2564,7 @@ rtpengine_query(); <function moreinfo="none">rtpengine_manage([flags])</function> </title> <para> - Manage the RTPProxy session - it combines the functionality of + Manage the RTPEngine session - it combines the functionality of rtpengine_offer(), rtpengine_answer() and rtpengine_delete(), detecting internally based on message type and method which one to execute. </para> @@ -2601,7 +2601,14 @@ rtpengine_query(); this function after resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpengine_manage() in the route block of - t_continue() does the same as in failure_route). + t_continue() does the same as in failure_route; use a branch route + to engage rtpengine for a forwarded branch after resuming the + transaction). + </para> + </listitem> + <listitem> + <para> + It does nothing if used inside event_route[tm:branch-failure:...] </para> </listitem> <listitem>

1 0

git:master:387de23a: rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...]
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: 387de23a5c9252ee8409d378ea452bfd52e416d4 URL: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:20:17+01:00 rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… Patch: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 4db1461f0d..c040c36444 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3616,9 +3616,14 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) int nosdp; tm_cell_t *t = NULL; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if (msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || - (msg->cseq==NULL))) - { + (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -3626,7 +3631,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) method = get_cseq(msg)->method_id; if (!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + || method==METHOD_BYE || method==METHOD_UPDATE)) return -1; if (method==METHOD_CANCEL || method==METHOD_BYE)

1 0

git:master:345d6f67: topoh: skip http reply handling
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: 345d6f67006e4254300209742a2778b925cafaf7 URL: https://github.com/kamailio/kamailio/commit/345d6f67006e4254300209742a2778b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-22T11:18:06+01:00 topoh: skip http reply handling --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/345d6f67006e4254300209742a2778b… Patch: https://github.com/kamailio/kamailio/commit/345d6f67006e4254300209742a2778b… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index fb5d045910..62606fdced 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -249,8 +249,14 @@ int th_prepare_msg(sip_msg_t *msg) LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { - LM_DBG("non sip message\n"); + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) + { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { + LM_DBG("unknown sip message type %d\n", msg->first_line.type); return 1; }

1 0

git:master:fad79564: topos: skip http reply handling
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: fad795648f8cbf12cc099dea18092ff7beee9c75 URL: https://github.com/kamailio/kamailio/commit/fad795648f8cbf12cc099dea18092ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-22T10:55:20+01:00 topos: skip http reply handling --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fad795648f8cbf12cc099dea18092ff… Patch: https://github.com/kamailio/kamailio/commit/fad795648f8cbf12cc099dea18092ff… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 22f2850d43..24f1216901 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -269,8 +269,13 @@ int tps_prepare_msg(sip_msg_t *msg) LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { - LM_DBG("non sip message\n"); + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { + LM_DBG("unknown sip message type %d\n", msg->first_line.type); return 1; }

1 0

git:5.2:ef8238a5: usrloc: Updated docs for 'timer_procs' parameter about multiple timer processes
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: ef8238a58dc901904e53655cf9e14028fd190c2b URL: https://github.com/kamailio/kamailio/commit/ef8238a58dc901904e53655cf9e1402… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:26:43+01:00 usrloc: Updated docs for 'timer_procs' parameter about multiple timer processes --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef8238a58dc901904e53655cf9e1402… Patch: https://github.com/kamailio/kamailio/commit/ef8238a58dc901904e53655cf9e1402… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 3dd180b937..74a1ac0506 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -952,6 +952,14 @@ modparam("usrloc", "db_check_update", 1) database. If set to 0, no dedicated timer is started, the one from core will be used. </para> + + <para> + If the number of timer processes is greater than 1, the workload + of synchronization and record expiration is split up among the + multiple processes. (Each process is assigned a range of slots + from the internal hash table, and is responsible for cleanup and + storage on those slots.) + </para> <para> <emphasis> Default value is <quote>0</quote>.

2 2

git:5.2:179026e0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: 179026e078427f64ad8b360a41ded71ca2706090 URL: https://github.com/kamailio/kamailio/commit/179026e078427f64ad8b360a41ded71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-21T17:31:36+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/179026e078427f64ad8b360a41ded71… Patch: https://github.com/kamailio/kamailio/commit/179026e078427f64ad8b360a41ded71… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index fdf6b6f18b..a16e84af55 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -854,6 +854,11 @@ modparam("usrloc", "db_check_update", 1) set to 0, no dedicated timer is started, the one from core will be used. + If the number of timer processes is greater than 1, the workload of + synchronization and record expiration is split up among the multiple + processes. (Each process is assigned a range of slots from the internal + hash table, and is responsible for cleanup and storage on those slots.) + Default value is “0”. Example 1.36. Set timer_procs parameter

1 0

git:5.3:f0c94fe9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: f0c94fe953c631b722d6ea87a7dc81b8d9842ad1 URL: https://github.com/kamailio/kamailio/commit/f0c94fe953c631b722d6ea87a7dc81b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-21T17:31:22+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/f0c94fe953c631b722d6ea87a7dc81b… Patch: https://github.com/kamailio/kamailio/commit/f0c94fe953c631b722d6ea87a7dc81b… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index ff466b0e78..b8b0ffcaac 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -854,6 +854,11 @@ modparam("usrloc", "db_check_update", 1) set to 0, no dedicated timer is started, the one from core will be used. + If the number of timer processes is greater than 1, the workload of + synchronization and record expiration is split up among the multiple + processes. (Each process is assigned a range of slots from the internal + hash table, and is responsible for cleanup and storage on those slots.) + Default value is “0”. Example 1.36. Set timer_procs parameter

1 0

git:5.3:dd78efd6: usrloc: Updated docs for 'timer_procs' parameter about multiple timer processes
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: dd78efd695490c68f21e13511c39956f95d503da URL: https://github.com/kamailio/kamailio/commit/dd78efd695490c68f21e13511c39956… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:25:10+01:00 usrloc: Updated docs for 'timer_procs' parameter about multiple timer processes --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd78efd695490c68f21e13511c39956… Patch: https://github.com/kamailio/kamailio/commit/dd78efd695490c68f21e13511c39956… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 0f14209784..d23b2a9e7e 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -952,6 +952,14 @@ modparam("usrloc", "db_check_update", 1) database. If set to 0, no dedicated timer is started, the one from core will be used. </para> + + <para> + If the number of timer processes is greater than 1, the workload + of synchronization and record expiration is split up among the + multiple processes. (Each process is assigned a range of slots + from the internal hash table, and is responsible for cleanup and + storage on those slots.) + </para> <para> <emphasis> Default value is <quote>0</quote>.

1 0

[kamailio/kamailio] Sipcapture fix hep attributes (#2214)
by Bastian Triller 21 Feb '20

21 Feb '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  `$hep(...)` pseudovariable returns wrong values for keys `src_ip`, `dst_ip` and `0x001`. This patch removes the keys `src_ip` and `dst_ip` (`$si` resp. `$Ri` can be used for these values). `0x001` now correctly returns IP protocol family (`AF_INET`, `AF_INET6` ...). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2214 -- Commit Summary -- * sipcapture: fix typo * sipcapture: fix inaccessible HEP chunks -- File Changes -- M src/modules/sipcapture/hep.c (2) M src/modules/sipcapture/sipcapture.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2214.patch https://github.com/kamailio/kamailio/pull/2214.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/2214

3 7

git:5.3:a1727714: sipcapture: fix typo
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: a1727714bcb4e78e455b77ec13dec4d7c4f7164a URL: https://github.com/kamailio/kamailio/commit/a1727714bcb4e78e455b77ec13dec4d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:21:11+01:00 sipcapture: fix typo (cherry picked from commit d4d7a8bb27426045de9afd8636729426a346ca79) --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/a1727714bcb4e78e455b77ec13dec4d… Patch: https://github.com/kamailio/kamailio/commit/a1727714bcb4e78e455b77ec13dec4d… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index f435477a09..7606241074 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -493,7 +493,7 @@ int parsing_hepv3_message(char *buf, unsigned int len) ri.bind_address = si; if(payload != NULL) { - /* and now recieve message */ + /* and now receive message */ if(hg->proto_t->data == 5) receive_logging_json_msg(payload, payload_len, hg, "rtcp_capture"); else if(hg->proto_t->data == 32) diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 3622feea50..10e9d90e4d 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2421,7 +2421,7 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) ri.bind_address = si; - /* and now recieve message */ + /* and now receive message */ receive_msg(buf + offset, len, &ri); if(si) pkg_free(si);

1 0

git:5.3:ded3181d: sipcapture: fix inaccessible HEP chunks
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: ded3181d36a496186214ff6940081bb5a3a339f6 URL: https://github.com/kamailio/kamailio/commit/ded3181d36a496186214ff6940081bb… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:21:15+01:00 sipcapture: fix inaccessible HEP chunks Chunk types 1 , 2 and 3 were not accessible. $hep(...) pseudovariable didn't return HEP chunks of type: * 1 (IP protocol family) returned HEP version (accessible via $hep(version)) * 2 (IP protocol ID) returned HEP message source IP * 3 (IPv4 source address) returned HEP message destination IP This removes keys src_ip and dst_ip. Use $si resp. $Ri instead. (cherry picked from commit 459ccabe9e3975dd5a90135ab96f3cccdf4ffdbe) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/ded3181d36a496186214ff6940081bb… Patch: https://github.com/kamailio/kamailio/commit/ded3181d36a496186214ff6940081bb… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 10e9d90e4d..5da37cbde7 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3043,14 +3043,6 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) else goto error; } break; - case 6: { - if(!strncmp(in->s, "src_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 2; - else if(!strncmp(in->s, "dst_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 3; - else - goto error; - } break; case 7: { if(!strncmp(in->s, "version", 7)) sp->pvp.pvn.u.isname.name.n = 0; @@ -3073,27 +3065,12 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - static char sc_buf_ip[IP_ADDR_MAX_STR_SIZE + 12]; - int sc_buf_ip_len; - if(param == NULL) return -1; switch(param->pvn.u.isname.name.n) { case 0: return pv_get_uintval(msg, param, res, hep_version(msg)); - case 1: - return pv_get_uintval(msg, param, res, hep_version(msg)); - case 2: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.src_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); - case 3: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.dst_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); default: return hepv3_get_chunk(msg, msg->buf, msg->len, param->pvn.u.isname.name.n, param, res);

1 0

git:5.2:8f72e21b: sipcapture: fix inaccessible HEP chunks
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: 8f72e21b5f68c4dd467e3a109b1d7b1ee6091872 URL: https://github.com/kamailio/kamailio/commit/8f72e21b5f68c4dd467e3a109b1d7b1… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:20:03+01:00 sipcapture: fix inaccessible HEP chunks Chunk types 1 , 2 and 3 were not accessible. $hep(...) pseudovariable didn't return HEP chunks of type: * 1 (IP protocol family) returned HEP version (accessible via $hep(version)) * 2 (IP protocol ID) returned HEP message source IP * 3 (IPv4 source address) returned HEP message destination IP This removes keys src_ip and dst_ip. Use $si resp. $Ri instead. (cherry picked from commit 459ccabe9e3975dd5a90135ab96f3cccdf4ffdbe) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/8f72e21b5f68c4dd467e3a109b1d7b1… Patch: https://github.com/kamailio/kamailio/commit/8f72e21b5f68c4dd467e3a109b1d7b1… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index f880ec4457..2050026808 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3049,14 +3049,6 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) else goto error; } break; - case 6: { - if(!strncmp(in->s, "src_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 2; - else if(!strncmp(in->s, "dst_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 3; - else - goto error; - } break; case 7: { if(!strncmp(in->s, "version", 7)) sp->pvp.pvn.u.isname.name.n = 0; @@ -3079,27 +3071,12 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - static char sc_buf_ip[IP_ADDR_MAX_STR_SIZE + 12]; - int sc_buf_ip_len; - if(param == NULL) return -1; switch(param->pvn.u.isname.name.n) { case 0: return pv_get_uintval(msg, param, res, hep_version(msg)); - case 1: - return pv_get_uintval(msg, param, res, hep_version(msg)); - case 2: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.src_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); - case 3: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.dst_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); default: return hepv3_get_chunk(msg, msg->buf, msg->len, param->pvn.u.isname.name.n, param, res);

1 0

git:5.2:073212e0: sipcapture: fix typo
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: 073212e027e4e90b4520b32d5563d53afd22e0d9 URL: https://github.com/kamailio/kamailio/commit/073212e027e4e90b4520b32d5563d53… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:19:55+01:00 sipcapture: fix typo (cherry picked from commit d4d7a8bb27426045de9afd8636729426a346ca79) --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/073212e027e4e90b4520b32d5563d53… Patch: https://github.com/kamailio/kamailio/commit/073212e027e4e90b4520b32d5563d53… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 0430b96969..f58cd7bf5e 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -493,7 +493,7 @@ int parsing_hepv3_message(char *buf, unsigned int len) ri.bind_address = si; if(payload != NULL) { - /* and now recieve message */ + /* and now receive message */ if(hg->proto_t->data == 5) receive_logging_json_msg(payload, payload_len, hg, "rtcp_capture"); else if(hg->proto_t->data == 32) diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index dbb53c0537..f880ec4457 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2424,7 +2424,7 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) ri.bind_address = si; - /* and now recieve message */ + /* and now receive message */ receive_msg(buf + offset, len, &ri); if(si) pkg_free(si);

1 0

git:master:459ccabe: sipcapture: fix inaccessible HEP chunks
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 459ccabe9e3975dd5a90135ab96f3cccdf4ffdbe URL: https://github.com/kamailio/kamailio/commit/459ccabe9e3975dd5a90135ab96f3cc… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:18:21+01:00 sipcapture: fix inaccessible HEP chunks Chunk types 1 , 2 and 3 were not accessible. $hep(...) pseudovariable didn't return HEP chunks of type: * 1 (IP protocol family) returned HEP version (accessible via $hep(version)) * 2 (IP protocol ID) returned HEP message source IP * 3 (IPv4 source address) returned HEP message destination IP This removes keys src_ip and dst_ip. Use $si resp. $Ri instead. --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/459ccabe9e3975dd5a90135ab96f3cc… Patch: https://github.com/kamailio/kamailio/commit/459ccabe9e3975dd5a90135ab96f3cc… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 10e9d90e4d..5da37cbde7 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3043,14 +3043,6 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) else goto error; } break; - case 6: { - if(!strncmp(in->s, "src_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 2; - else if(!strncmp(in->s, "dst_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 3; - else - goto error; - } break; case 7: { if(!strncmp(in->s, "version", 7)) sp->pvp.pvn.u.isname.name.n = 0; @@ -3073,27 +3065,12 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - static char sc_buf_ip[IP_ADDR_MAX_STR_SIZE + 12]; - int sc_buf_ip_len; - if(param == NULL) return -1; switch(param->pvn.u.isname.name.n) { case 0: return pv_get_uintval(msg, param, res, hep_version(msg)); - case 1: - return pv_get_uintval(msg, param, res, hep_version(msg)); - case 2: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.src_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); - case 3: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.dst_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); default: return hepv3_get_chunk(msg, msg->buf, msg->len, param->pvn.u.isname.name.n, param, res);

1 0

git:master:d4d7a8bb: sipcapture: fix typo
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: d4d7a8bb27426045de9afd8636729426a346ca79 URL: https://github.com/kamailio/kamailio/commit/d4d7a8bb27426045de9afd863672942… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:18:21+01:00 sipcapture: fix typo --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/d4d7a8bb27426045de9afd863672942… Patch: https://github.com/kamailio/kamailio/commit/d4d7a8bb27426045de9afd863672942… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index f435477a09..7606241074 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -493,7 +493,7 @@ int parsing_hepv3_message(char *buf, unsigned int len) ri.bind_address = si; if(payload != NULL) { - /* and now recieve message */ + /* and now receive message */ if(hg->proto_t->data == 5) receive_logging_json_msg(payload, payload_len, hg, "rtcp_capture"); else if(hg->proto_t->data == 32) diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 3622feea50..10e9d90e4d 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2421,7 +2421,7 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) ri.bind_address = si; - /* and now recieve message */ + /* and now receive message */ receive_msg(buf + offset, len, &ri); if(si) pkg_free(si);

1 0

git:master:5750b405: usrloc: Updated documentation for 'timer_procs' parameter to clarify purpose of having multiple timer processes.
by Your Name 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 5750b405e78de7d2f701708f9c41126c3173d8f5 URL: https://github.com/kamailio/kamailio/commit/5750b405e78de7d2f701708f9c41126… Author: Your Name <you(a)example.com> Committer: Your Name <you(a)example.com> Date: 2020-02-20T10:35:19-05:00 usrloc: Updated documentation for 'timer_procs' parameter to clarify purpose of having multiple timer processes. Raised in this sr-users thread by Joel Serrano: https://lists.kamailio.org/pipermail/sr-users/2020-February/108306.html --- Modified: src/modules/usrloc/README Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5750b405e78de7d2f701708f9c41126… Patch: https://github.com/kamailio/kamailio/commit/5750b405e78de7d2f701708f9c41126… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index ff466b0e78..40f9f0f1cd 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -854,6 +854,12 @@ modparam("usrloc", "db_check_update", 1) set to 0, no dedicated timer is started, the one from core will be used. + If the number of timer processes is greater than 1, the workload + of synchronization and record expiration is split up among the + multiple processes. (Each process is assigned a range of slots + from the internal hash table, and is responsible for cleanup and + storage on those slots.) + Default value is “0”. Example 1.36. Set timer_procs parameter diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 0f14209784..d23b2a9e7e 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -952,6 +952,14 @@ modparam("usrloc", "db_check_update", 1) database. If set to 0, no dedicated timer is started, the one from core will be used. </para> + + <para> + If the number of timer processes is greater than 1, the workload + of synchronization and record expiration is split up among the + multiple processes. (Each process is assigned a range of slots + from the internal hash table, and is responsible for cleanup and + storage on those slots.) + </para> <para> <emphasis> Default value is <quote>0</quote>.

3 2

ims_qos module - dedicated bearer release after call end
by Pafel 21 Feb '20

21 Feb '20

Hello, I am using ims qos module to send Rx_AAR for dedicated bearer via Diameter RX interface. Kamailio PCSCF is configured with #!define WITH_RX_CALL. It is working as expected but I have an issue with the release of the bearer after the call is disconnected. There is no function available to release the bearer. As I saw the only way to do this is via the rx_auth_expiry which is static: modparam("ims_qos", "rx_auth_expiry", 120) Is this something that is planned to be developed in the future or there is something I am missing? Thanks in advance! Regards, Pavel

2 3

git:master:84e049e7: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 84e049e7976c8c1407ae6d109fb4c10395b852de URL: https://github.com/kamailio/kamailio/commit/84e049e7976c8c1407ae6d109fb4c10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-21T10:01:15+01:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/84e049e7976c8c1407ae6d109fb4c10… Patch: https://github.com/kamailio/kamailio/commit/84e049e7976c8c1407ae6d109fb4c10…

1 0

git:master:b96a1be8: kex: docs for rpc stats.fetchn command
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: b96a1be81c6f4bb8ac3a8b11a02fc5d6a55faf41 URL: https://github.com/kamailio/kamailio/commit/b96a1be81c6f4bb8ac3a8b11a02fc5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T09:54:18+01:00 kex: docs for rpc stats.fetchn command --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b96a1be81c6f4bb8ac3a8b11a02fc5d… Patch: https://github.com/kamailio/kamailio/commit/b96a1be81c6f4bb8ac3a8b11a02fc5d… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 4893b4a280..334f989342 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -740,8 +740,8 @@ resetdebug(); <para>Print the list of available internal statistics.</para> <para>NOTE: the result is an array of strings that have the list of statistics formated like "name = value", being propagated over the time - from the MI variant. Use "stats.fetch" command to have a more - JSON-friendly output.</para> + from the MI variant. Use "stats.fetch" or "stats.fetchn"commands to have + a more JSON-friendly output.</para> <para>Parameters: <emphasis>statsid</emphasis> - which statistics to be printed. If set to 'all' then all statistics are printed; if set to 'statsgroup:' then all statistics in the group are printed; @@ -777,6 +777,29 @@ resetdebug(); &kamcmd; stats.fetch shmem.free_size &kamcmd; stats.fetch shmem: fwd_requests fwd_replies </programlisting> + </section> + <section id="kex.r.stats.fetchn"> + <title> + <function moreinfo="none">stats.fetchn</function> + </title> + <para>Print the list of available internal statistics with a more + json friendly output. Each printed statistic is a field in the output + structure: {"statsgroup.statsname" : statsvalue}. The value is + represented as number.</para> + <para>Parameters: <emphasis>statsid</emphasis> - which statistics to + be printed. If set to 'all' then all statistics are printed; if + set to 'statsgroup:' then all statistics in the group are printed; + if set to 'statsname' then the statistics identified by the name + is printed (can be also 'statsgroup.stastname' or + 'statsgroup:statsname').</para> + <para>Examples:</para> + <programlisting format="linespecific"> + &kamcmd; stats.fetchn all + &kamcmd; stats.fetchn core: + &kamcmd; stats.fetchn unsupported_methods + &kamcmd; stats.fetchn shmem.free_size + &kamcmd; stats.fetchn shmem: fwd_requests fwd_replies + </programlisting> </section> <section id="kex.r.stats.reset_statistics"> <title>

1 0

git:master:7a9cb26a: kex: new rpc command stats.fetchn
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 7a9cb26aafc95ec8acb44ce36e513303319b8b6d URL: https://github.com/kamailio/kamailio/commit/7a9cb26aafc95ec8acb44ce36e51330… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T09:51:12+01:00 kex: new rpc command stats.fetchn - get internal statistics with the values represented as numbers - alternative to stats.fetch where the values are represented as strings --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/7a9cb26aafc95ec8acb44ce36e51330… Patch: https://github.com/kamailio/kamailio/commit/7a9cb26aafc95ec8acb44ce36e51330…

1 0

git:master:61ffd51c: tm: exported function to kemi returning the branch index
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 61ffd51c45daaefd87c7ec4a9d4d05afc9a306d6 URL: https://github.com/kamailio/kamailio/commit/61ffd51c45daaefd87c7ec4a9d4d05a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T08:58:24+01:00 tm: exported function to kemi returning the branch index --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/61ffd51c45daaefd87c7ec4a9d4d05a… Patch: https://github.com/kamailio/kamailio/commit/61ffd51c45daaefd87c7ec4a9d4d05a… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index b9b7f94877..8bcb1bd570 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -63,6 +63,7 @@ #include "../../core/cfg/cfg.h" #include "../../core/globals.h" #include "../../core/timer_ticks.h" +#include "../../core/dset.h" #include "../../core/mod_fix.h" #include "../../core/kemi.h" @@ -922,6 +923,50 @@ static int w_t_get_status_code(sip_msg_t* msg, char *p1, char *p2) return ki_t_get_status_code(msg); } +static int ki_t_get_branch_index(sip_msg_t* msg) +{ + tm_cell_t *t = 0; + tm_ctx_t *tcx = 0; + int idx = T_BR_UNDEFINED; + + if(msg==NULL) { + return -1; + } + + /* statefull replies have the branch_index set */ + if(msg->first_line.type == SIP_REPLY) { + tcx = tm_ctx_get(); + if(tcx != NULL) { + idx = tcx->branch_index; + } + } else switch(route_type) { + case BRANCH_ROUTE: + case BRANCH_FAILURE_ROUTE: + /* branch and branch_failure routes have their index set */ + tcx = tm_ctx_get(); + if(tcx != NULL) { + idx = tcx->branch_index; + } + break; + case REQUEST_ROUTE: + /* take the branch number from the number of added branches */ + idx = nr_branches; + break; + case FAILURE_ROUTE: + /* first get the transaction */ + t = get_t(); + if ( t == NULL || t == T_UNDEFINED ) { + return -1; + } + /* add the currently added branches to the number of + * completed branches in the transaction + */ + idx = t->nr_of_outgoings + nr_branches; + break; + } + return idx; +} + static int t_check_status(struct sip_msg* msg, char *p1, char *foo) { regmatch_t pmatch; @@ -3162,6 +3207,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_get_branch_index"), + SR_KEMIP_INT, ki_t_get_branch_index, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:5.2:3d5e468a: core: propagate xflags inside sip_msg_update_buffer() to new msg
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: 3d5e468acd49df316844bc985147e6a9592a877a URL: https://github.com/kamailio/kamailio/commit/3d5e468acd49df316844bc985147e6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T08:43:09+01:00 core: propagate xflags inside sip_msg_update_buffer() to new msg - xflags were lost when the msg structure was reinitialized (e.g., after msg_apply_chages()) (cherry picked from commit 2c6e87c50b13acdd94f77491eda0d73430f58dfc) (cherry picked from commit 38869d54ed6210f63fceb185a6531193eed1629f) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/3d5e468acd49df316844bc985147e6a… Patch: https://github.com/kamailio/kamailio/commit/3d5e468acd49df316844bc985147e6a… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 9898f32622..5ee3a5c5d9 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3246,6 +3246,7 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) msg->set_global_port = tmp.set_global_port; msg->flags = tmp.flags; msg->msg_flags = tmp.msg_flags; + memcpy(msg->xflags, tmp.xflags, KSR_XFLAGS_SIZE * sizeof(flag_t)); msg->hash_index = tmp.hash_index; msg->force_send_socket = tmp.force_send_socket; msg->fwd_send_flags = tmp.fwd_send_flags;

1 0

git:5.3:38869d54: core: propagate xflags inside sip_msg_update_buffer() to new msg
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: 38869d54ed6210f63fceb185a6531193eed1629f URL: https://github.com/kamailio/kamailio/commit/38869d54ed6210f63fceb185a653119… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T08:42:02+01:00 core: propagate xflags inside sip_msg_update_buffer() to new msg - xflags were lost when the msg structure was reinitialized (e.g., after msg_apply_chages()) (cherry picked from commit 2c6e87c50b13acdd94f77491eda0d73430f58dfc) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/38869d54ed6210f63fceb185a653119… Patch: https://github.com/kamailio/kamailio/commit/38869d54ed6210f63fceb185a653119… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 2e9d9da240..354d887330 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3250,6 +3250,7 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) msg->set_global_port = tmp.set_global_port; msg->flags = tmp.flags; msg->msg_flags = tmp.msg_flags; + memcpy(msg->xflags, tmp.xflags, KSR_XFLAGS_SIZE * sizeof(flag_t)); msg->hash_index = tmp.hash_index; msg->force_send_socket = tmp.force_send_socket; msg->fwd_send_flags = tmp.fwd_send_flags;

1 0

git:master:2c6e87c5: core: propagate xflags inside sip_msg_update_buffer() to new msg
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 2c6e87c50b13acdd94f77491eda0d73430f58dfc URL: https://github.com/kamailio/kamailio/commit/2c6e87c50b13acdd94f77491eda0d73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T08:39:47+01:00 core: propagate xflags inside sip_msg_update_buffer() to new msg - xflags were lost when the msg structure was reinitialized (e.g., after msg_apply_chages()) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/2c6e87c50b13acdd94f77491eda0d73… Patch: https://github.com/kamailio/kamailio/commit/2c6e87c50b13acdd94f77491eda0d73… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 2b9bde51ec..91fdfeb711 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3249,6 +3249,7 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) msg->set_global_port = tmp.set_global_port; msg->flags = tmp.flags; msg->msg_flags = tmp.msg_flags; + memcpy(msg->xflags, tmp.xflags, KSR_XFLAGS_SIZE * sizeof(flag_t)); msg->hash_index = tmp.hash_index; msg->force_send_socket = tmp.force_send_socket; msg->fwd_send_flags = tmp.fwd_send_flags;

1 0

Re: [sr-dev] [kamailio/kamailio] usrloc: Updated documentation for 'timer_procs' parameter to clarify purpose of having multiple timer processes. (5750b40)
by Alex Balashov 20 Feb '20

20 Feb '20

No worries. Thanks! — Sent from mobile, with due apologies for brevity and errors. > On Feb 20, 2020, at 12:25 PM, Henning Westerholt <notifications(a)github.com> wrote: > > > Hi Alex, as you pushed already to the public git master, it is better not to change it now as other people have already checked it out. The author information is in the archives now due to this discussion. > > — > You are receiving this because you commented. > Reply to this email directly, view it on GitHub, or unsubscribe. -- 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/commit/5750b405e78de7d2f701708f9c41126…

1 0

Re: [sr-dev] [kamailio/kamailio] usrloc: Updated documentation for 'timer_procs' parameter to clarify purpose of having multiple timer processes. (5750b40)
by Henning Westerholt 20 Feb '20

20 Feb '20

Hi Alex, as you pushed already to the public git master, it is better not to change it now as other people have already checked it out. The author information is in the archives now due to this discussion. -- 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/commit/5750b405e78de7d2f701708f9c41126…

1 0

Re: [sr-dev] [kamailio/kamailio] usrloc: Updated documentation for 'timer_procs' parameter to clarify purpose of having multiple timer processes. (5750b40)
by Alex Balashov 20 Feb '20

20 Feb '20

Argh, I accidentally committed this without setting `git config user.email` & `user.name` on my repository clone, sorry. I've amended the commit on my side but can't push it because it's a non-FF. Can this be rebased or otherwise fixed? -- 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/commit/5750b405e78de7d2f701708f9c41126…

1 0

git:master:22fa8367: usrloc: coherent coding style in mod init function
by Daniel-Constantin Mierla 20 Feb '20

20 Feb '20

Module: kamailio Branch: master Commit: 22fa836797d729e9eec4ab6bac8b2daf49a0e8db URL: https://github.com/kamailio/kamailio/commit/22fa836797d729e9eec4ab6bac8b2da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-20T15:50:58+01:00 usrloc: coherent coding style in mod init function --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/22fa836797d729e9eec4ab6bac8b2da… Patch: https://github.com/kamailio/kamailio/commit/22fa836797d729e9eec4ab6bac8b2da… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 4bba3534d1..eb05305724 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -285,8 +285,9 @@ static int mod_init(void) ul_rm_expired_delay); ul_rm_expired_delay = 0; } - if(sruid_init(&_ul_sruid, '-', "ulcx", SRUID_INC)<0) + if(sruid_init(&_ul_sruid, '-', "ulcx", SRUID_INC)<0) { return -1; + } #ifdef STATISTICS /* register statistics */ @@ -296,16 +297,16 @@ static int mod_init(void) } #endif - if (rpc_register_array(ul_rpc)!=0) - { + if (rpc_register_array(ul_rpc)!=0) { LM_ERR("failed to register RPC commands\n"); return -1; } - if(ul_hash_size<=1) + if(ul_hash_size<=1) { ul_hash_size = 512; - else + } else { ul_hash_size = 1<<ul_hash_size; + } /* check matching mode */ switch (ul_matching_mode) { @@ -319,13 +320,13 @@ static int mod_init(void) } /* Register cache timer */ - if(ul_timer_procs<=0) - { - if (timer_interval > 0) + if(ul_timer_procs<=0) { + if (timer_interval > 0) { register_timer(ul_core_timer, 0, timer_interval); - } - else + } + } else { register_sync_timers(ul_timer_procs); + } /* init the callbacks list */ if ( init_ulcb_list() < 0) { @@ -374,8 +375,9 @@ static int mod_init(void) } } - if (handle_lost_tcp && db_mode == DB_ONLY) + if (handle_lost_tcp && db_mode == DB_ONLY) { LM_WARN("handle_lost_tcp option makes nothing in DB_ONLY mode\n"); + } if(db_mode != DB_ONLY) { ul_set_xavp_contact_clone(1);

1 0

git:master:01ac570c: misc: examples - use kx functions instead of pv for lua routing file
by Daniel-Constantin Mierla 20 Feb '20

20 Feb '20

Module: kamailio Branch: master Commit: 01ac570c2fbda800d1e00cd50305739cf0596ebf URL: https://github.com/kamailio/kamailio/commit/01ac570c2fbda800d1e00cd50305739… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-20T14:50:51+01:00 misc: examples - use kx functions instead of pv for lua routing file --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/01ac570c2fbda800d1e00cd50305739… Patch: https://github.com/kamailio/kamailio/commit/01ac570c2fbda800d1e00cd50305739…

1 0

git:5.2:1d907f64: Revert "tm: set send socket flag when computing the destination and local socket is found"
by Daniel-Constantin Mierla 19 Feb '20

19 Feb '20

Module: kamailio Branch: 5.2 Commit: 1d907f64c6d676aecc96a91d7c31ca0f269eab61 URL: https://github.com/kamailio/kamailio/commit/1d907f64c6d676aecc96a91d7c31ca0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-19T13:10:39+01:00 Revert "tm: set send socket flag when computing the destination and local socket is found" This reverts commit 09ac3e47ef79dbd599b7dec5b84ae3b792f025ed. --- Modified: src/modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/1d907f64c6d676aecc96a91d7c31ca0… Patch: https://github.com/kamailio/kamailio/commit/1d907f64c6d676aecc96a91d7c31ca0… --- diff --git a/src/modules/tm/ut.h b/src/modules/tm/ut.h index 98aaffa549..41e69c407f 100644 --- a/src/modules/tm/ut.h +++ b/src/modules/tm/ut.h @@ -296,7 +296,6 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, dst->proto, 0); if (dst->send_sock){ dst->to=to; - dst->send_flags.f |= SND_F_FORCE_SOCKET; return dst; /* found a good one */ } }while(dns_srv_handle_next(dns_h, err)); @@ -318,8 +317,6 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, proto2a(dst->proto), su2a(&dst->to, sizeof(dst->to))); /* ser_error = E_NO_SOCKET;*/ /* try to continue */ - } else { - dst->send_flags.f |= SND_F_FORCE_SOCKET; } return dst; }

1 0

git:master:25e61922: db: update README describing the DB XML framework
by Henning Westerholt 18 Feb '20

18 Feb '20

Module: kamailio Branch: master Commit: 25e61922244ec9c438fc472500472b59d191093a URL: https://github.com/kamailio/kamailio/commit/25e61922244ec9c438fc472500472b5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-18T17:09:53+01:00 db: update README describing the DB XML framework --- Modified: doc/stylesheets/dbschema/README --- Diff: https://github.com/kamailio/kamailio/commit/25e61922244ec9c438fc472500472b5… Patch: https://github.com/kamailio/kamailio/commit/25e61922244ec9c438fc472500472b5… --- diff --git a/doc/stylesheets/dbschema/README b/doc/stylesheets/dbschema/README index 8708ce8066..9213773806 100644 --- a/doc/stylesheets/dbschema/README +++ b/doc/stylesheets/dbschema/README @@ -1,12 +1,9 @@ -SER supports multiple database servers, at the moment of writing this text -MySQL, PostgreSQL, dbtext (aka plain text files), and Oracle databases are -supported. Maintaining database schema for each database separately would be -tedious job, therefore SER keeps the database schema in an XML-based format -and schema definitions for the database servers are generated automatically -using stylesheets. +Kamailio supports multiple database servers in the SQL and also NoSQL area. +Maintaining database schema for each database separately would be tedious job, +therefore Kamailio keeps the database schema in an XML-based format and schema +definitions for the database servers are generated automatically using +stylesheets. This directory contains DTD (Document Type Definition) files describing the structure of the XML-based database description language and XSL stylesheets used to generate database schema files for all the database servers. - - -- Jan Janak <jan(a)iptel.org>

1 0

git:master:6fb8cb82: dispatcher: docs - added modparams for keepalives in sample config file
by Daniel-Constantin Mierla 18 Feb '20

18 Feb '20

Module: kamailio Branch: master Commit: 6fb8cb820207e51e7e6ae07020c17c32b9fa9aa0 URL: https://github.com/kamailio/kamailio/commit/6fb8cb820207e51e7e6ae07020c17c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-18T14:51:46+01:00 dispatcher: docs - added modparams for keepalives in sample config file --- Modified: src/modules/dispatcher/doc/dispatcher.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6fb8cb820207e51e7e6ae07020c17c3… Patch: https://github.com/kamailio/kamailio/commit/6fb8cb820207e51e7e6ae07020c17c3… --- diff --git a/src/modules/dispatcher/doc/dispatcher.cfg b/src/modules/dispatcher/doc/dispatcher.cfg index 08913c39b3..98492ec5c2 100644 --- a/src/modules/dispatcher/doc/dispatcher.cfg +++ b/src/modules/dispatcher/doc/dispatcher.cfg @@ -121,6 +121,10 @@ modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) modparam("dispatcher", "xavp_dst", "_dsdst_") modparam("dispatcher", "xavp_ctx", "_dsctx_") +modparam("dispatcher", "ds_ping_from", "sip:proxy@kamailio.org") +modparam("dispatcher", "ds_ping_interval", 60) +modparam("dispatcher", "ds_probing_mode", 1) +modparam("dispatcher", "ds_timer_mode", 1) ####### Routing Logic ########

1 0

New developer: Federico Santulli
by Henning Westerholt 18 Feb '20

18 Feb '20

Hello, Federico Santulli has joined the developer group on the Kamailio GitHub project. He contributed new Kamailio packages for the Gentoo distribution. Federico will continue to work on Gentoo packaging and also contributing fixes or extensions in other areas. His GitHub Id is "fsantulli". Thank you Federico, for the contributions so far and looking forward to future collaboration! Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:5.2:f860d670: db: small spelling fix in docs
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: 5.2 Commit: f860d6703bfc9ab5c9ff66660326fa90c22b15bb URL: https://github.com/kamailio/kamailio/commit/f860d6703bfc9ab5c9ff66660326fa9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T16:43:09+01:00 db: small spelling fix in docs (cherry picked from commit 942d1cc40a1772ffd7a7d62bf1354a0b6343f7fa) --- Modified: src/lib/srdb1/schema/silo.xml --- Diff: https://github.com/kamailio/kamailio/commit/f860d6703bfc9ab5c9ff66660326fa9… Patch: https://github.com/kamailio/kamailio/commit/f860d6703bfc9ab5c9ff66660326fa9… --- diff --git a/src/lib/srdb1/schema/silo.xml b/src/lib/srdb1/schema/silo.xml index bf510ee94f..6883ecf862 100644 --- a/src/lib/srdb1/schema/silo.xml +++ b/src/lib/srdb1/schema/silo.xml @@ -14,7 +14,7 @@ <description> <db:para> This table us used by the msilo module to provide offline message - storage More information about the msilo module can be found at: + storage. More information about the msilo module can be found at: <itemizedlist> <listitem> <ulink url="&KAMAILIO_MOD_DOC;msilo.html">&KAMAILIO_MOD_DOC;msilo.html</ulink>.

1 0

git:5.3:09914df5: db: small spelling fix in docs
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: 5.3 Commit: 09914df5a9d5638bb99ae5f89378fcfedd9a9e04 URL: https://github.com/kamailio/kamailio/commit/09914df5a9d5638bb99ae5f89378fcf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T16:42:52+01:00 db: small spelling fix in docs (cherry picked from commit 942d1cc40a1772ffd7a7d62bf1354a0b6343f7fa) --- Modified: src/lib/srdb1/schema/silo.xml --- Diff: https://github.com/kamailio/kamailio/commit/09914df5a9d5638bb99ae5f89378fcf… Patch: https://github.com/kamailio/kamailio/commit/09914df5a9d5638bb99ae5f89378fcf… --- diff --git a/src/lib/srdb1/schema/silo.xml b/src/lib/srdb1/schema/silo.xml index bf510ee94f..6883ecf862 100644 --- a/src/lib/srdb1/schema/silo.xml +++ b/src/lib/srdb1/schema/silo.xml @@ -14,7 +14,7 @@ <description> <db:para> This table us used by the msilo module to provide offline message - storage More information about the msilo module can be found at: + storage. More information about the msilo module can be found at: <itemizedlist> <listitem> <ulink url="&KAMAILIO_MOD_DOC;msilo.html">&KAMAILIO_MOD_DOC;msilo.html</ulink>.

1 0

git:master:942d1cc4: db: small spelling fix in docs
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: master Commit: 942d1cc40a1772ffd7a7d62bf1354a0b6343f7fa URL: https://github.com/kamailio/kamailio/commit/942d1cc40a1772ffd7a7d62bf1354a0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T16:42:11+01:00 db: small spelling fix in docs --- Modified: src/lib/srdb1/schema/silo.xml --- Diff: https://github.com/kamailio/kamailio/commit/942d1cc40a1772ffd7a7d62bf1354a0… Patch: https://github.com/kamailio/kamailio/commit/942d1cc40a1772ffd7a7d62bf1354a0… --- diff --git a/src/lib/srdb1/schema/silo.xml b/src/lib/srdb1/schema/silo.xml index bf510ee94f..6883ecf862 100644 --- a/src/lib/srdb1/schema/silo.xml +++ b/src/lib/srdb1/schema/silo.xml @@ -14,7 +14,7 @@ <description> <db:para> This table us used by the msilo module to provide offline message - storage More information about the msilo module can be found at: + storage. More information about the msilo module can be found at: <itemizedlist> <listitem> <ulink url="&KAMAILIO_MOD_DOC;msilo.html">&KAMAILIO_MOD_DOC;msilo.html</ulink>.

1 0

git:master:f405f033: kemix: exported function to get next hop uri
by Daniel-Constantin Mierla 17 Feb '20

17 Feb '20

Module: kamailio Branch: master Commit: f405f033a74673a7beeb4fd93a13538275c6b8c9 URL: https://github.com/kamailio/kamailio/commit/f405f033a74673a7beeb4fd93a13538… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-17T16:37:55+01:00 kemix: exported function to get next hop uri --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f405f033a74673a7beeb4fd93a13538… Patch: https://github.com/kamailio/kamailio/commit/f405f033a74673a7beeb4fd93a13538… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 0409e56d21..d261766f85 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -778,6 +778,21 @@ static sr_kemi_xval_t* ki_kx_gete_duri(sip_msg_t *msg) return ki_kx_get_duri_mode(msg, SR_KEMI_XVAL_NULL_EMPTY); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_nhuri(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg->dst_uri.s==NULL || msg->dst_uri.len<=0) { + return ki_kx_get_ruri(msg); + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->dst_uri; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -938,7 +953,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - + { str_init("kx"), str_init("get_nhuri"), + SR_KEMIP_XVAL, ki_kx_get_nhuri, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_ua"), SR_KEMIP_XVAL, ki_kx_get_ua, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] pkg/gentoo: Added ebuild files for versions 5.1.10, 5.2.6, 5.3.2 and master (#2220)
by Federico Santulli 17 Feb '20

17 Feb '20

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  pkg/gentoo: Added ebuild files for versions 5.1.10, 5.2.6, 5.3.2 and master You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2220 -- Commit Summary -- * pkg/gentoo: Added ebuild files for versions 5.1.10, 5.2.6, 5.3.2 and -- File Changes -- A pkg/kamailio/gentoo/files/kamailio.confd (14) A pkg/kamailio/gentoo/files/kamailio.initd (43) A pkg/kamailio/gentoo/kamailio-5.1.10.ebuild (153) A pkg/kamailio/gentoo/kamailio-5.2.6.ebuild (156) A pkg/kamailio/gentoo/kamailio-5.3.2.ebuild (155) A pkg/kamailio/gentoo/kamailio-9999.ebuild (162) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2220.patch https://github.com/kamailio/kamailio/pull/2220.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/2220

4 9

git:5.2:443b06bf: pkg: add ebuild for 5.2 branch for new gento packages (GH #2220)
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: 5.2 Commit: 443b06bf396afcb25d09d1cf5ca450ffd07e2252 URL: https://github.com/kamailio/kamailio/commit/443b06bf396afcb25d09d1cf5ca450f… Author: Federico Santulli <federico.santulli(a)nhm.it> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T11:09:34+01:00 pkg: add ebuild for 5.2 branch for new gento packages (GH #2220) --- Added: pkg/kamailio/gentoo/kamailio-5.2.6.ebuild --- Diff: https://github.com/kamailio/kamailio/commit/443b06bf396afcb25d09d1cf5ca450f… Patch: https://github.com/kamailio/kamailio/commit/443b06bf396afcb25d09d1cf5ca450f…

1 0

git:5.2:b389c875: pkg: add generic files for new gento packages (GH #2220)
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: 5.2 Commit: b389c87575a43b78fa9667e88e9647e218cadce4 URL: https://github.com/kamailio/kamailio/commit/b389c87575a43b78fa9667e88e9647e… Author: Federico Santulli <federico.santulli(a)nhm.it> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T11:07:43+01:00 pkg: add generic files for new gento packages (GH #2220) (cherry picked from commit d94fce63e496f1039ed6b39ce2dfc257a8e60da2) --- Added: pkg/kamailio/gentoo/files/kamailio.confd Added: pkg/kamailio/gentoo/files/kamailio.initd --- Diff: https://github.com/kamailio/kamailio/commit/b389c87575a43b78fa9667e88e9647e… Patch: https://github.com/kamailio/kamailio/commit/b389c87575a43b78fa9667e88e9647e… --- diff --git a/pkg/kamailio/gentoo/files/kamailio.confd b/pkg/kamailio/gentoo/files/kamailio.confd new file mode 100644 index 0000000000..a1b6c9ff7c --- /dev/null +++ b/pkg/kamailio/gentoo/files/kamailio.confd @@ -0,0 +1,14 @@ +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# Additional options to start Kamailio with +# +# see "kamailio -h" for a list of options +# +# default: run Kamailio as user:group = kamailio:kamailio +# +KAMAILIO_OPTS="-u kamailio -g kamailio -f /etc/kamailio/kamailio.cfg" + +#rc_use="mysql" +#rc_ulimit="-n 1048576" \ No newline at end of file diff --git a/pkg/kamailio/gentoo/files/kamailio.initd b/pkg/kamailio/gentoo/files/kamailio.initd new file mode 100644 index 0000000000..1a26895e65 --- /dev/null +++ b/pkg/kamailio/gentoo/files/kamailio.initd @@ -0,0 +1,43 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header$ + +extra_commands="checkconfig" + +depend() { + need net + use syslog +} + +start() { + checkconfig_real || return $? + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet --pidfile /var/run/${SVCNAME}.pid \ + --exec /usr/sbin/kamailio -- ${KAMAILIO_OPTS} -P /var/run/${SVCNAME}.pid + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid + eend $? +} + +checkconfig() { + ebegin "Checking ${SVCNAME} config file" + checkconfig_real + eend $? +} + +checkconfig_real() { + local TMPLOG=$(mktemp) + /usr/sbin/kamailio ${KAMAILIO_OPTS} -P /var/run/${SVCNAME}.pid -c >"${TMPLOG}" 2>&1 + local ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected a syntax error in your configuration file:" + cat ${TMPLOG}; rm ${TMPLOG} + fi + return $ret +} \ No newline at end of file

1 0

git:5.3:92005917: pkg: add ebuild for 5.3 branch for new gento packages (GH #2220)
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: 5.3 Commit: 920059179d3fcd15cf3c132ba60d69757a9ba4a8 URL: https://github.com/kamailio/kamailio/commit/920059179d3fcd15cf3c132ba60d697… Author: Federico Santulli <federico.santulli(a)nhm.it> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T11:10:28+01:00 pkg: add ebuild for 5.3 branch for new gento packages (GH #2220) --- Added: pkg/kamailio/gentoo/kamailio-5.3.2.ebuild --- Diff: https://github.com/kamailio/kamailio/commit/920059179d3fcd15cf3c132ba60d697… Patch: https://github.com/kamailio/kamailio/commit/920059179d3fcd15cf3c132ba60d697…

1 0

git:5.3:1ed796ca: pkg: add generic files for new gento packages (GH #2220)
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: 5.3 Commit: 1ed796ca3813e4fde557af6a605e768b38acbf6e URL: https://github.com/kamailio/kamailio/commit/1ed796ca3813e4fde557af6a605e768… Author: Federico Santulli <federico.santulli(a)nhm.it> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T11:08:16+01:00 pkg: add generic files for new gento packages (GH #2220) (cherry picked from commit d94fce63e496f1039ed6b39ce2dfc257a8e60da2) --- Added: pkg/kamailio/gentoo/files/kamailio.confd Added: pkg/kamailio/gentoo/files/kamailio.initd --- Diff: https://github.com/kamailio/kamailio/commit/1ed796ca3813e4fde557af6a605e768… Patch: https://github.com/kamailio/kamailio/commit/1ed796ca3813e4fde557af6a605e768… --- diff --git a/pkg/kamailio/gentoo/files/kamailio.confd b/pkg/kamailio/gentoo/files/kamailio.confd new file mode 100644 index 0000000000..a1b6c9ff7c --- /dev/null +++ b/pkg/kamailio/gentoo/files/kamailio.confd @@ -0,0 +1,14 @@ +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# Additional options to start Kamailio with +# +# see "kamailio -h" for a list of options +# +# default: run Kamailio as user:group = kamailio:kamailio +# +KAMAILIO_OPTS="-u kamailio -g kamailio -f /etc/kamailio/kamailio.cfg" + +#rc_use="mysql" +#rc_ulimit="-n 1048576" \ No newline at end of file diff --git a/pkg/kamailio/gentoo/files/kamailio.initd b/pkg/kamailio/gentoo/files/kamailio.initd new file mode 100644 index 0000000000..1a26895e65 --- /dev/null +++ b/pkg/kamailio/gentoo/files/kamailio.initd @@ -0,0 +1,43 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header$ + +extra_commands="checkconfig" + +depend() { + need net + use syslog +} + +start() { + checkconfig_real || return $? + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet --pidfile /var/run/${SVCNAME}.pid \ + --exec /usr/sbin/kamailio -- ${KAMAILIO_OPTS} -P /var/run/${SVCNAME}.pid + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid + eend $? +} + +checkconfig() { + ebegin "Checking ${SVCNAME} config file" + checkconfig_real + eend $? +} + +checkconfig_real() { + local TMPLOG=$(mktemp) + /usr/sbin/kamailio ${KAMAILIO_OPTS} -P /var/run/${SVCNAME}.pid -c >"${TMPLOG}" 2>&1 + local ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected a syntax error in your configuration file:" + cat ${TMPLOG}; rm ${TMPLOG} + fi + return $ret +} \ No newline at end of file

1 0

git:master:3ff9cf08: pkg: add ebuild for git master for new gento packages (GH #2220)
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: master Commit: 3ff9cf08a2e158ef31ca9f4a1b249e9a202145ac URL: https://github.com/kamailio/kamailio/commit/3ff9cf08a2e158ef31ca9f4a1b249e9… Author: Federico Santulli <federico.santulli(a)nhm.it> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T11:04:36+01:00 pkg: add ebuild for git master for new gento packages (GH #2220) --- Added: pkg/kamailio/gentoo/kamailio-9999.ebuild --- Diff: https://github.com/kamailio/kamailio/commit/3ff9cf08a2e158ef31ca9f4a1b249e9… Patch: https://github.com/kamailio/kamailio/commit/3ff9cf08a2e158ef31ca9f4a1b249e9…

1 0

git:master:d94fce63: pkg: add generic files for new gento packages (GH #2220)
by Henning Westerholt 17 Feb '20

17 Feb '20

Module: kamailio Branch: master Commit: d94fce63e496f1039ed6b39ce2dfc257a8e60da2 URL: https://github.com/kamailio/kamailio/commit/d94fce63e496f1039ed6b39ce2dfc25… Author: Federico Santulli <federico.santulli(a)nhm.it> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-17T11:03:38+01:00 pkg: add generic files for new gento packages (GH #2220) --- Added: pkg/kamailio/gentoo/files/kamailio.confd Added: pkg/kamailio/gentoo/files/kamailio.initd --- Diff: https://github.com/kamailio/kamailio/commit/d94fce63e496f1039ed6b39ce2dfc25… Patch: https://github.com/kamailio/kamailio/commit/d94fce63e496f1039ed6b39ce2dfc25… --- diff --git a/pkg/kamailio/gentoo/files/kamailio.confd b/pkg/kamailio/gentoo/files/kamailio.confd new file mode 100644 index 0000000000..a1b6c9ff7c --- /dev/null +++ b/pkg/kamailio/gentoo/files/kamailio.confd @@ -0,0 +1,14 @@ +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# Additional options to start Kamailio with +# +# see "kamailio -h" for a list of options +# +# default: run Kamailio as user:group = kamailio:kamailio +# +KAMAILIO_OPTS="-u kamailio -g kamailio -f /etc/kamailio/kamailio.cfg" + +#rc_use="mysql" +#rc_ulimit="-n 1048576" \ No newline at end of file diff --git a/pkg/kamailio/gentoo/files/kamailio.initd b/pkg/kamailio/gentoo/files/kamailio.initd new file mode 100644 index 0000000000..1a26895e65 --- /dev/null +++ b/pkg/kamailio/gentoo/files/kamailio.initd @@ -0,0 +1,43 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header$ + +extra_commands="checkconfig" + +depend() { + need net + use syslog +} + +start() { + checkconfig_real || return $? + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet --pidfile /var/run/${SVCNAME}.pid \ + --exec /usr/sbin/kamailio -- ${KAMAILIO_OPTS} -P /var/run/${SVCNAME}.pid + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid + eend $? +} + +checkconfig() { + ebegin "Checking ${SVCNAME} config file" + checkconfig_real + eend $? +} + +checkconfig_real() { + local TMPLOG=$(mktemp) + /usr/sbin/kamailio ${KAMAILIO_OPTS} -P /var/run/${SVCNAME}.pid -c >"${TMPLOG}" 2>&1 + local ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected a syntax error in your configuration file:" + cat ${TMPLOG}; rm ${TMPLOG} + fi + return $ret +} \ No newline at end of file

1 0

[kamailio/kamailio] pkg/gentoo: Added ebuild files for versions 5.1.10, 5.2.6, 5.3.2 and master (#2219)
by Federico Santulli 16 Feb '20

16 Feb '20

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2219 -- Commit Summary -- * Added missing KEMI functions, fixed sources loading and match_mode in * Added pkg_free at returning of check_whitelist and check_blacklist * userblacklist: moved pkg_free to kemi functions instead of native ones. * userblacklist: fixed rpc_child_init behaviour as changed add_source * userblacklist: added missing pkg_free before returning * pkg/gentoo: Added ebuild files for versions 5.1.10, 5.2.6, 5.3.2 and * Merge pull request #1 from kamailio/master -- File Changes -- A pkg/kamailio/gentoo/files/kamailio.confd (14) A pkg/kamailio/gentoo/files/kamailio.initd (43) A pkg/kamailio/gentoo/kamailio-5.1.10.ebuild (153) A pkg/kamailio/gentoo/kamailio-5.2.6.ebuild (156) A pkg/kamailio/gentoo/kamailio-5.3.2.ebuild (155) A pkg/kamailio/gentoo/kamailio-9999.ebuild (162) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2219.patch https://github.com/kamailio/kamailio/pull/2219.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/2219

1 3

About FOSDEM talks
by Federico Santulli 16 Feb '20

16 Feb '20

Hi Henning, as I was discussing with you at the fosdem dinner we were developing something on the 5.3 branch yet: we have a module for the history info processing with functions and pv variables $hi[index] handling. As I told you before moving the pvs to the core, we would like to have a well tested module. We have also added functions to the sdpops module to allow codec reorder, remove and other manipulations over the request/response processing (matching between invites and updates with 200 OK responses). We have added native and kemi functions to the userblacklist module where we do global filtering based on the from uri or other customer selected field. We have also readded and updated the Gentoo ebuilds that were removed many releases ago. We based them on the stable releases and we have one too for git with version 9999 as usual. Do you think we can start to push some code? Kind regards. Federico Santulli NHM - S.R.L. Via Raffaello Sanzio, 88 81031 Aversa (CE) Italy

4 8

git:master:bb7f26b3: core: dprint - compare func name against null to avoid latest gcc warnings
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: bb7f26b3b423d801a244d597ed79ac2b3fcae831 URL: https://github.com/kamailio/kamailio/commit/bb7f26b3b423d801a244d597ed79ac2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T20:59:38+01:00 core: dprint - compare func name against null to avoid latest gcc warnings --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/bb7f26b3b423d801a244d597ed79ac2… Patch: https://github.com/kamailio/kamailio/commit/bb7f26b3b423d801a244d597ed79ac2… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index fead97c4bb..2972799ed2 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -194,8 +194,8 @@ void log_prefix_init(void); #define LOGV_PREFIX_STR ((log_prefix_val)?log_prefix_val->s:"") #define LOGV_PREFIX_LEN ((log_prefix_val)?log_prefix_val->len:0) -#define LOGV_FUNCNAME_STR(vfuncname) (((void*)vfuncname)?vfuncname:"") -#define LOGV_FUNCSUFFIX_STR(vfuncname) (((void*)vfuncname)?_FUNC_SUFFIX_:"") +#define LOGV_FUNCNAME_STR(vfuncname) (((void*)vfuncname!=NULL)?vfuncname:"") +#define LOGV_FUNCSUFFIX_STR(vfuncname) (((void*)vfuncname!=NULL)?_FUNC_SUFFIX_:"") /** @brief * General logging macros

1 0

Errored: kamailio/kamailio#8413 (master - 35ca40c)
by Travis CI 15 Feb '20

15 Feb '20

Build Update for kamailio/kamailio ------------------------------------- Build: #8413 Status: Errored Duration: 5 mins and 45 secs Commit: 35ca40c (master) Author: Daniel-Constantin Mierla Message: core: dprint - try to make gcc happy evaluating __func__ - gcc throws warning without cast, clang is ok View the changeset: https://github.com/kamailio/kamailio/compare/0c20b2976db5...35ca40c564d8 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/650891347?utm_medium=notific… -- 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.

1 0

git:master:35ca40c5: core: dprint - try to make gcc happy evaluating __func__
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: 35ca40c564d8b55b873f92cc30865ce2472d0457 URL: https://github.com/kamailio/kamailio/commit/35ca40c564d8b55b873f92cc30865ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T19:33:02+01:00 core: dprint - try to make gcc happy evaluating __func__ - gcc throws warning without cast, clang is ok --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/35ca40c564d8b55b873f92cc30865ce… Patch: https://github.com/kamailio/kamailio/commit/35ca40c564d8b55b873f92cc30865ce… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index d2f4de2007..fead97c4bb 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -194,8 +194,8 @@ void log_prefix_init(void); #define LOGV_PREFIX_STR ((log_prefix_val)?log_prefix_val->s:"") #define LOGV_PREFIX_LEN ((log_prefix_val)?log_prefix_val->len:0) -#define LOGV_FUNCNAME_STR(vfuncname) ((vfuncname)?vfuncname:"") -#define LOGV_FUNCSUFFIX_STR(vfuncname) ((vfuncname)?_FUNC_SUFFIX_:"") +#define LOGV_FUNCNAME_STR(vfuncname) (((void*)vfuncname)?vfuncname:"") +#define LOGV_FUNCSUFFIX_STR(vfuncname) (((void*)vfuncname)?_FUNC_SUFFIX_:"") /** @brief * General logging macros

1 0

Errored: kamailio/kamailio#8412 (master - 0c20b29)
by Travis CI 15 Feb '20

15 Feb '20

Build Update for kamailio/kamailio ------------------------------------- Build: #8412 Status: Errored Duration: 5 mins and 39 secs Commit: 0c20b29 (master) Author: Daniel-Constantin Mierla Message: xprint: updates to used log macros View the changeset: https://github.com/kamailio/kamailio/compare/e1f1b3a5e55e...0c20b2976db5 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/650844663?utm_medium=notific… -- 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.

1 0

git:master:0c20b297: xprint: updates to used log macros
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: 0c20b2976db55876fae2d1351f3a0b3c6e6a7b6e URL: https://github.com/kamailio/kamailio/commit/0c20b2976db55876fae2d1351f3a0b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:16:55+01:00 xprint: updates to used log macros --- Modified: src/modules/xprint/xprint.c --- Diff: https://github.com/kamailio/kamailio/commit/0c20b2976db55876fae2d1351f3a0b3… Patch: https://github.com/kamailio/kamailio/commit/0c20b2976db55876fae2d1351f3a0b3… --- diff --git a/src/modules/xprint/xprint.c b/src/modules/xprint/xprint.c index 2547868cc4..26ce25e550 100644 --- a/src/modules/xprint/xprint.c +++ b/src/modules/xprint/xprint.c @@ -142,7 +142,7 @@ static int xplog(struct sip_msg* msg, char* lev, char* frm) return -1; /* log_buf[log_len] = '\0'; */ - LOG_(DEFAULT_FACILITY, level, "<script>: ", "%.*s", log_len, log_buf); + LOG_FN(DEFAULT_FACILITY, level, "<script>: ", "%.*s", log_len, log_buf); return 1; } @@ -159,7 +159,7 @@ static int xpdbg(struct sip_msg* msg, char* frm, char* str2) return -1; /* log_buf[log_len] = '\0'; */ - LOG_(DEFAULT_FACILITY, L_DBG, "<script>: ", "%.*s", log_len, log_buf); + LOG_FN(DEFAULT_FACILITY, L_DBG, "<script>: ", "%.*s", log_len, log_buf); return 1; }

1 0

git:master:cad3ae51: tls: updates to used log macros
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: cad3ae51f25aedb5632d1ee7107dd11997a559c7 URL: https://github.com/kamailio/kamailio/commit/cad3ae51f25aedb5632d1ee7107dd11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:16:55+01:00 tls: updates to used log macros --- Modified: src/modules/tls/tls_bio.c Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/cad3ae51f25aedb5632d1ee7107dd11… Patch: https://github.com/kamailio/kamailio/commit/cad3ae51f25aedb5632d1ee7107dd11… --- diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c index beb177399d..8fbb53a3b3 100644 --- a/src/modules/tls/tls_bio.c +++ b/src/modules/tls/tls_bio.c @@ -39,11 +39,11 @@ #ifdef TLS_BIO_DEBUG #ifdef __SUNPRO_C #define TLS_BIO_DBG(...) \ - LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + LOG_FP(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ "tls_BIO: " LOC_INFO, __VA_ARGS__) #else #define TLS_BIO_DBG(args...) \ - LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + LOG_FP(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ "tls_BIO: " LOC_INFO, ## args) #endif /* __SUNPRO_c */ #else /* TLS_BIO_DEBUG */ diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 5d3bc94522..9ce1b5e2f3 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -90,12 +90,12 @@ int tls_run_event_routes(struct tcp_connection *c); #ifdef TLS_F_DEBUG #ifdef __SUNPRO_C #define TLS_F_TRACE(fmt, ...) \ - LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + LOG_FP(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ "TLS_TRACE: " LOC_INFO, " %s" fmt,\ _FUNC_NAME_, __VA_ARGS__) #else #define TLS_F_TRACE(fmt, args...) \ - LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + LOG_FP(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ "TLS_TRACE: " LOC_INFO, " %s" fmt,\ _FUNC_NAME_, ## args) #endif /* __SUNPRO_c */

1 0

git:master:6f1c6437: xlog: updates to used log macros
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: 6f1c64377d1222a88fb0f86dfe4f879cf2572377 URL: https://github.com/kamailio/kamailio/commit/6f1c64377d1222a88fb0f86dfe4f879… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:16:55+01:00 xlog: updates to used log macros --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/6f1c64377d1222a88fb0f86dfe4f879… Patch: https://github.com/kamailio/kamailio/commit/6f1c64377d1222a88fb0f86dfe4f879… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index 2909232dc1..ed167d80ba 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -235,15 +235,15 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, if(line>0) if(long_format==1) - LOG_(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix, "%s:%d:%.*s", (xm->a)?(((xm->a->cfile)?xm->a->cfile:"")):"", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix, "%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix, "%.*s", txt.len, txt.s); return 1; } @@ -855,7 +855,7 @@ int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) pv_elem_free_all(xmodel); return -1; } - LOG_(xlog_facility, llevel, _xlog_prefix, + LOG_FN(xlog_facility, llevel, _xlog_prefix, "%.*s", txt.len, txt.s);; pv_elem_free_all(xmodel); return 1;

1 0

git:master:528eb33b: debugger: updates to used log macros
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: 528eb33bd569db6258e351a295a7a0a459fa7a43 URL: https://github.com/kamailio/kamailio/commit/528eb33bd569db6258e351a295a7a0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:16:55+01:00 debugger: updates to used log macros --- Modified: src/modules/debugger/debugger_api.c --- Diff: https://github.com/kamailio/kamailio/commit/528eb33bd569db6258e351a295a7a0a… Patch: https://github.com/kamailio/kamailio/commit/528eb33bd569db6258e351a295a7a0a… --- diff --git a/src/modules/debugger/debugger_api.c b/src/modules/debugger/debugger_api.c index eb34abfd0c..e9dd4c8fd7 100644 --- a/src/modules/debugger/debugger_api.c +++ b/src/modules/debugger/debugger_api.c @@ -359,7 +359,7 @@ int dbg_cfg_trace(sr_event_param_t *evp) { if(is_printable(_dbg_cfgtrace_level)) { - LOG__(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, + LOG_FL(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, "%s=[%s] c=[%s] l=%d a=%d n=%.*s\n", get_current_route_type_name(), ZSW(a->rname),

1 0

git:master:3ea30335: core: mem/q_malloc - updates to used log macros
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: 3ea303350eebf32232421c9888266286d9a3e86d URL: https://github.com/kamailio/kamailio/commit/3ea303350eebf32232421c988826628… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:15:10+01:00 core: mem/q_malloc - updates to used log macros --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/3ea303350eebf32232421c988826628… Patch: https://github.com/kamailio/kamailio/commit/3ea303350eebf32232421c988826628…

1 0

git:master:6e6c9160: core: mem/tlsf_malloc - updates to used log macros
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: 6e6c91601e3a9a6cb797fe87a1d4c6430331db38 URL: https://github.com/kamailio/kamailio/commit/6e6c91601e3a9a6cb797fe87a1d4c64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:15:25+01:00 core: mem/tlsf_malloc - updates to used log macros --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6c91601e3a9a6cb797fe87a1d4c64… Patch: https://github.com/kamailio/kamailio/commit/6e6c91601e3a9a6cb797fe87a1d4c64… --- diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 4907142e9b..33bbf4869d 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -1201,22 +1201,22 @@ void tlsf_status(tlsf_t pool) block_header_t* pb; memlog=cfg_get(core, core_cfg, memlog); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", "status of pool (%p):\n", pool); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", "heap size= %zu\n", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "status of pool (%p):\n", pool); + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "heap size= %zu\n", control->total_size); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "used= %zu, used+overhead=%zu, free=%zu, fragments=%zu\n", control->allocated, control->real_used, control->total_size - control->real_used, control->fragments); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "max used (+overhead)=%zu, max fragments=%zu\n", control->max_used, control->max_fragments); /* print a summary of the 2 levels bucket list */ - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "Free blocks matrix ('.': none, 'X': between 2^X and (2^(X+1)-1) free blocks, X=A..Z, A=0, B=1, ...)\n"); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "> first-level: %d block list arrays between 2^fl and 2^(fl+1) bytes (fl=%d..%d)\n", FL_INDEX_COUNT, FL_INDEX_SHIFT, FL_INDEX_MAX); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "v second-level: %d block lists between 2^fl+sl*2^(fl-%d) and 2^fl+(sl+1)*2^(fl-%d)-1 bytes (sl=0..%d)\n", SL_INDEX_COUNT, SL_INDEX_COUNT_LOG2, SL_INDEX_COUNT_LOG2, SL_INDEX_COUNT-1); for (sl = 0 ; sl < SL_INDEX_COUNT ; sl++) { @@ -1234,7 +1234,7 @@ void tlsf_status(tlsf_t pool) summary[fl] = 'A' + tlsf_fls(len); } } - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "%2d|%.*s|\n", sl, FL_INDEX_COUNT, summary); } } @@ -1270,7 +1270,7 @@ void tlsf_sums(tlsf_t pool) memlog=cfg_get(core, core_cfg, memlog); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_sums: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_sums: ", "pool (%p) summarizing all alloc'ed. fragments:\n", pool); @@ -1287,7 +1287,7 @@ void tlsf_sums(tlsf_t pool) x = root; while(x){ - LOG_(DEFAULT_FACILITY, memlog, "tlsf_sums: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_sums: ", " count=%6d size=%10lu bytes from %s: %s(%ld)\n", x->count,x->size, x->file, x->func, x->line @@ -1296,7 +1296,7 @@ void tlsf_sums(tlsf_t pool) free(x); x = root; } - LOG_(DEFAULT_FACILITY, memlog, "tlsf_sums: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_sums: ", "-----------------------------\n"); }

1 0

git:master:950c3ba3: core: mem/f_malloc - updates to used log macros
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: 950c3ba398d75b1606995a60b6128f1efa788bb2 URL: https://github.com/kamailio/kamailio/commit/950c3ba398d75b1606995a60b6128f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:14:26+01:00 core: mem/f_malloc - updates to used log macros --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/950c3ba398d75b1606995a60b6128f1… Patch: https://github.com/kamailio/kamailio/commit/950c3ba398d75b1606995a60b6128f1…

1 0

git:master:a7f86225: core: dprint - log macro to print message without function name
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: a7f862259f83af5d9296202a26b3bf80125d1397 URL: https://github.com/kamailio/kamailio/commit/a7f862259f83af5d9296202a26b3bf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:08:02+01:00 core: dprint - log macro to print message without function name - LOG_FN(...) skips printing the function name, to have a variant used in a few places (xlog, xpring) and be same output format like previous releases - renamed log macros ending in underscores to be easier to follow the code and search for places of usage --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/a7f862259f83af5d9296202a26b3bf8… Patch: https://github.com/kamailio/kamailio/commit/a7f862259f83af5d9296202a26b3bf8…

1 0

git:master:c1ea3634: core: action - update used log macro for core log() function
by Daniel-Constantin Mierla 15 Feb '20

15 Feb '20

Module: kamailio Branch: master Commit: c1ea36344448efe8a06c0c74fad73db07c9174ed URL: https://github.com/kamailio/kamailio/commit/c1ea36344448efe8a06c0c74fad73db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:11:10+01:00 core: action - update used log macro for core log() function --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/c1ea36344448efe8a06c0c74fad73db… Patch: https://github.com/kamailio/kamailio/commit/c1ea36344448efe8a06c0c74fad73db… --- diff --git a/src/core/action.c b/src/core/action.c index 8211cf00f7..633a38da16 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -506,7 +506,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=E_BUG; goto error; } - LOG_(DEFAULT_FACILITY, a->val[0].u.number, "<script>: ", "%s", + LOG_FN(DEFAULT_FACILITY, a->val[0].u.number, "<script>: ", "%s", a->val[1].u.string); ret=1; break;

1 0

git:master:e1f1b3a5: tmx: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: e1f1b3a5e55e05a80af4e2ef91fac42892211c08 URL: https://github.com/kamailio/kamailio/commit/e1f1b3a5e55e05a80af4e2ef91fac42… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 tmx: convert to memory logging helper --- Modified: src/modules/tmx/t_var.c Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/e1f1b3a5e55e05a80af4e2ef91fac42… Patch: https://github.com/kamailio/kamailio/commit/e1f1b3a5e55e05a80af4e2ef91fac42… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 1f83eca50d..15938fcd9e 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -117,7 +117,7 @@ int pv_t_update_req(struct sip_msg *msg) _pv_treq.buf = (char*)pkg_malloc(_pv_treq.buf_size*sizeof(char)); if(_pv_treq.buf==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; _pv_treq.buf_size = 0; return -1; } @@ -195,7 +195,7 @@ int pv_t_update_rpl(struct sip_msg *msg) _pv_trpl.buf = (char*)pkg_malloc(_pv_trpl.buf_size*sizeof(char)); if(_pv_trpl.buf==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; _pv_trpl.buf_size = 0; return -1; } @@ -263,7 +263,7 @@ int pv_t_update_inv(struct sip_msg *msg) _pv_tinv.buf = (char*)pkg_malloc(_pv_tinv.buf_size*sizeof(char)); if(_pv_tinv.buf==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; _pv_tinv.buf_size = 0; goto error; } @@ -368,8 +368,10 @@ int pv_parse_t_var_name(pv_spec_p sp, str *in) return -1; pv = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); - if(pv==NULL) + if(pv==NULL) { + PKG_MEM_ERROR; return -1; + } memset(pv, 0, sizeof(pv_spec_t)); diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 67c4f7f4af..256c82bf16 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -89,7 +89,7 @@ int tmx_init_pretran_table(void) _tmx_ptran_table = (pretran_slot_t*)shm_malloc(_tmx_ptran_size*sizeof(pretran_slot_t)); if(_tmx_ptran_table == NULL) { - LM_ERR("not enough shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(_tmx_ptran_table, 0, _tmx_ptran_size*sizeof(pretran_slot_t)); @@ -249,7 +249,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(unlikely(_tmx_proc_ptran == NULL)) { _tmx_proc_ptran = (pretran_t*)shm_malloc(sizeof(pretran_t)); if(_tmx_proc_ptran == NULL) { - LM_ERR("not enough memory for pretran structure\n"); + SHM_MEM_ERROR_FMT("pretran structure\n"); return -1; } memset(_tmx_proc_ptran, 0, sizeof(pretran_t)); @@ -270,7 +270,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(_tmx_proc_ptran->dbuf.s) shm_free(_tmx_proc_ptran->dbuf.s); _tmx_proc_ptran->dbuf.s = (char*)shm_malloc(dsize); if(_tmx_proc_ptran->dbuf.s==NULL) { - LM_ERR("not enough memory for pretran data\n"); + SHM_MEM_ERROR_FMT("pretran data\n"); return -1; } _tmx_proc_ptran->dbuf.len = dsize;

1 0

git:master:b06268f0: topos: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: b06268f071ac614f914669a0888c59b8b4255ed2 URL: https://github.com/kamailio/kamailio/commit/b06268f071ac614f914669a0888c59b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 topos: convert to memory logging helper --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/b06268f071ac614f914669a0888c59b… Patch: https://github.com/kamailio/kamailio/commit/b06268f071ac614f914669a0888c59b… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 3bb5f12f46..e40a51003e 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -163,8 +163,7 @@ int tps_add_headers(sip_msg_t *msg, str *hname, str *hbody, int hpos) hs.len = hname->len + 2 + hbody->len; hs.s = (char*)pkg_malloc(hs.len + 3); if (hs.s==NULL) { - LM_ERR("no pkg memory left (%.*s - %d)\n", - hname->len, hname->s, hs.len); + PKG_MEM_ERROR_FMT("(%.*s - %d)\n", hname->len, hname->s, hs.len); return -1; } memcpy(hs.s, hname->s, hname->len);

1 0

git:master:32c917f6: topoh: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 32c917f6a9a1bf4f5b95d3bdcbc5f3efdd209948 URL: https://github.com/kamailio/kamailio/commit/32c917f6a9a1bf4f5b95d3bdcbc5f3e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 topoh: convert to memory logging helper --- Modified: src/modules/topoh/th_mask.c Modified: src/modules/topoh/th_msg.c Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/32c917f6a9a1bf4f5b95d3bdcbc5f3e… Patch: https://github.com/kamailio/kamailio/commit/32c917f6a9a1bf4f5b95d3bdcbc5f3e… --- diff --git a/src/modules/topoh/th_mask.c b/src/modules/topoh/th_mask.c index cc2ae7e5a9..122d0935a5 100644 --- a/src/modules/topoh/th_mask.c +++ b/src/modules/topoh/th_mask.c @@ -98,7 +98,7 @@ char* th_mask_encode(char *in, int ilen, str *prefix, int *olen) out = (char*)pkg_malloc((*olen+1)*sizeof(char)); if(out==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; *olen = 0; return NULL; } @@ -151,7 +151,7 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) if(out==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; *olen = 0; return NULL; } diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 6849520540..990128c01e 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -294,7 +294,7 @@ int th_mask_contact(sip_msg_t *msg) p = (char*)pkg_malloc(out.len+3); if(p==NULL) { - LM_ERR("failed to get more pkg\n"); + PKG_MEM_ERROR; pkg_free(out.s); return -1; } @@ -441,7 +441,7 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) via2=pkg_malloc(sizeof(struct via_body)); if (via2==0) { - LM_ERR("out of memory\n"); + PKG_MEM_ERROR; pkg_free(out.s); return -1; @@ -983,7 +983,7 @@ int th_add_via_cookie(sip_msg_t *msg, struct via_body *via) out.s = (char*)pkg_malloc(out.len+1); if(out.s==0) { - LM_ERR("no pkg memory\n"); + PKG_MEM_ERROR; return -1; } out.s[0] = ';'; @@ -1009,7 +1009,7 @@ int th_add_hdr_cookie(sip_msg_t *msg) h.s = (char*)pkg_malloc(h.len+1); if(h.s == 0) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 0eb5345598..fb5d045910 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -186,7 +186,7 @@ static int mod_init(void) th_via_prefix.s = (char*)pkg_malloc(th_via_prefix.len+1); if(th_via_prefix.s==NULL) { - LM_ERR("via prefix parameter is invalid\n"); + PKG_MEM_ERROR_FMT("via prefix parameter\n"); goto error; } /* 'sip:' + ip + ';' + param + '=' + prefix (+ '\0') */ @@ -195,7 +195,7 @@ static int mod_init(void) th_uri_prefix.s = (char*)pkg_malloc(th_uri_prefix.len+1); if(th_uri_prefix.s==NULL) { - LM_ERR("uri prefix parameter is invalid\n"); + PKG_MEM_ERROR_FMT("uri prefix parameter\n"); goto error; } /* build via prefix */

1 0

git:master:9a132d30: uac: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 9a132d30fa035197bf562fc563939a57b8f6ff68 URL: https://github.com/kamailio/kamailio/commit/9a132d30fa035197bf562fc563939a5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 uac: convert to memory logging helper --- Modified: src/modules/uac/auth.c Modified: src/modules/uac/auth_hdr.c Modified: src/modules/uac/replace.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/9a132d30fa035197bf562fc563939a5… Patch: https://github.com/kamailio/kamailio/commit/9a132d30fa035197bf562fc563939a5…

1 0

git:master:9d316f2d: tsilo: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 9d316f2d0d2744c956e85a3619f6e39852aca20f URL: https://github.com/kamailio/kamailio/commit/9d316f2d0d2744c956e85a3619f6e39… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 tsilo: convert to memory logging helper --- Modified: src/modules/tsilo/ts_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/9d316f2d0d2744c956e85a3619f6e39… Patch: https://github.com/kamailio/kamailio/commit/9d316f2d0d2744c956e85a3619f6e39… --- diff --git a/src/modules/tsilo/ts_hash.c b/src/modules/tsilo/ts_hash.c index 5532dfd52d..26f0097c6b 100644 --- a/src/modules/tsilo/ts_hash.c +++ b/src/modules/tsilo/ts_hash.c @@ -74,7 +74,7 @@ int init_ts_table(unsigned int size) t_table = (struct ts_table*)shm_malloc( sizeof(struct ts_table)); if (t_table==0) { - LM_ERR("no more shm mem (1)\n"); + SHM_MEM_ERROR; return -1; } @@ -104,7 +104,7 @@ int init_ts_table(unsigned int size) t_table->entries = (ts_entry_t*)shm_malloc(sizeof(ts_entry_t) * size); if (!t_table->entries) { - LM_ERR("no more shm mem (2)\n"); + SHM_MEM_ERROR; goto error; } @@ -210,14 +210,14 @@ int new_ts_urecord(str* ruri, ts_urecord_t** _r) { *_r = (ts_urecord_t*)shm_malloc(sizeof(ts_urecord_t)); if (*_r == 0) { - LM_ERR("no more share memory\n"); + SHM_MEM_ERROR; return -1; } memset(*_r, 0, sizeof(ts_urecord_t)); (*_r)->ruri.s = (char*)shm_malloc(ruri->len); if ((*_r)->ruri.s == 0) { - LM_ERR("no more share memory\n"); + SHM_MEM_ERROR; shm_free(*_r); *_r = 0; return -2; @@ -362,7 +362,7 @@ ts_transaction_t* new_ts_transaction(int tindex, int tlabel) len = sizeof(ts_transaction_t); ts = (ts_transaction_t*)shm_malloc(len); if (ts==0) { - LM_ERR("no more shm mem (%d)\n",len); + SHM_MEM_ERROR_FMT("len %d\n", len); return 0; } @@ -388,7 +388,7 @@ ts_transaction_t* clone_ts_transaction(ts_transaction_t* ts) len = sizeof(ts_transaction_t); ts_clone = (ts_transaction_t*)shm_malloc(len); if (ts_clone==NULL) { - LM_ERR("no more shm mem (%d)\n",len); + SHM_MEM_ERROR_FMT("len %d\n", len); return NULL; }

1 0

git:master:1c7809b1: uac_redirect: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 1c7809b1f7e0ac5c4a08cda686f3cf867281eb7a URL: https://github.com/kamailio/kamailio/commit/1c7809b1f7e0ac5c4a08cda686f3cf8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 uac_redirect: convert to memory logging helper --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/1c7809b1f7e0ac5c4a08cda686f3cf8… Patch: https://github.com/kamailio/kamailio/commit/1c7809b1f7e0ac5c4a08cda686f3cf8… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 31507c4e47..57ec038b39 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -180,7 +180,7 @@ static int get_redirect_fixup(void** param, int param_no) /* set the reason str */ accp = (struct acc_param*)pkg_malloc(sizeof(struct acc_param)); if (accp==0) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; return E_UNSPEC; } memset( accp, 0, sizeof(struct acc_param)); @@ -241,8 +241,10 @@ static int regexp_compile(char *re_s, regex_t **re) if (re_s==0 || strlen(re_s)==0 ) { return 0; } else { - if ((*re=pkg_malloc(sizeof(regex_t)))==0) + if ((*re=pkg_malloc(sizeof(regex_t)))==0) { + PKG_MEM_ERROR; return E_OUT_OF_MEM; + } if (regcomp(*re, re_s, REG_EXTENDED|REG_ICASE|REG_NEWLINE) ){ pkg_free(*re); *re = 0;

1 0

git:master:cf489648: uid_domain: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: cf489648cfb957c49bd256e8d029fb949984673b URL: https://github.com/kamailio/kamailio/commit/cf489648cfb957c49bd256e8d029fb9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 uid_domain: convert to memory logging helper --- Modified: src/modules/uid_domain/domain.c Modified: src/modules/uid_domain/hash.c Modified: src/modules/uid_domain/uid_domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf489648cfb957c49bd256e8d029fb9… Patch: https://github.com/kamailio/kamailio/commit/cf489648cfb957c49bd256e8d029fb9… --- diff --git a/src/modules/uid_domain/domain.c b/src/modules/uid_domain/domain.c index 0c4332a106..3fe1d62676 100644 --- a/src/modules/uid_domain/domain.c +++ b/src/modules/uid_domain/domain.c @@ -78,7 +78,8 @@ static int domain_add(domain_t* d, str* domain, unsigned int flags) d->n++; return 0; - error: +error: + SHM_MEM_ERROR; ERR("Unable to add new domain name (out of memory)\n"); if (dom.s) shm_free(dom.s); return -1; @@ -145,7 +146,8 @@ static domain_t* new_domain(str* did, str* domain, unsigned int flags) return d; - error: +error: + SHM_MEM_ERROR; ERR("Unable to create new domain structure\n"); free_domain(d); return 0; @@ -355,7 +357,7 @@ int db_get_did(str* did, str* domain) } else { did->s = pkg_malloc(rec->fld[0].v.lstr.len); if (!did->s) { - ERR("No memory left\n"); + PKG_MEM_ERROR; goto err; } memcpy(did->s, rec->fld[0].v.lstr.s, rec->fld[0].v.lstr.len); @@ -389,7 +391,7 @@ int is_domain_local(str* domain) */ tmp.s = pkg_malloc(domain->len); if (!tmp.s) { - ERR("No memory left\n"); + PKG_MEM_ERROR; return -1; } memcpy(tmp.s, domain->s, domain->len); diff --git a/src/modules/uid_domain/hash.c b/src/modules/uid_domain/hash.c index 5ae24d62a0..15b447076e 100644 --- a/src/modules/uid_domain/hash.c +++ b/src/modules/uid_domain/hash.c @@ -64,7 +64,7 @@ static struct hash_entry* new_hash_entry(str* key, domain_t* domain) e = (struct hash_entry*)shm_malloc(sizeof(struct hash_entry)); if (!e) { - ERR("Not enough memory left\n"); + SHM_MEM_ERROR; return 0; } e->key = *key; diff --git a/src/modules/uid_domain/uid_domain_mod.c b/src/modules/uid_domain/uid_domain_mod.c index a261904588..fb96b906df 100644 --- a/src/modules/uid_domain/uid_domain_mod.c +++ b/src/modules/uid_domain/uid_domain_mod.c @@ -245,7 +245,7 @@ static int allocate_tables(void) domains_2 = (domain_t**)shm_malloc(sizeof(domain_t*)); if (!hash_1 || !hash_2 || !active_hash || !domains_1 || !domains_2) { - ERR("No memory left\n"); + SHM_MEM_ERROR; return -1; } memset(hash_1, 0, sizeof(struct hash_entry*) * HASH_SIZE); @@ -444,7 +444,7 @@ static int lookup_domain(struct sip_msg* msg, char* flags, char* fp) tmp.s = pkg_malloc(domain.len); if (!tmp.s) { - ERR("No memory left\n"); + PKG_MEM_ERROR; return -1; } memcpy(tmp.s, domain.s, domain.len); @@ -480,7 +480,7 @@ static int get_did(str* did, str* domain) tmp.s = pkg_malloc(domain->len); if (!tmp.s) { - ERR("No memory left\n"); + PKG_MEM_ERROR; return -1; } memcpy(tmp.s, domain->s, domain->len);

1 0

git:master:118b2214: uid_avp_db: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 118b22145dc0605db7e04f336588cc6d240dcdf1 URL: https://github.com/kamailio/kamailio/commit/118b22145dc0605db7e04f336588cc6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 uid_avp_db: convert to memory logging helper --- Modified: src/modules/uid_avp_db/extra_attrs.c --- Diff: https://github.com/kamailio/kamailio/commit/118b22145dc0605db7e04f336588cc6… Patch: https://github.com/kamailio/kamailio/commit/118b22145dc0605db7e04f336588cc6… --- diff --git a/src/modules/uid_avp_db/extra_attrs.c b/src/modules/uid_avp_db/extra_attrs.c index 6a88655c70..fd7a2db174 100644 --- a/src/modules/uid_avp_db/extra_attrs.c +++ b/src/modules/uid_avp_db/extra_attrs.c @@ -147,7 +147,7 @@ int declare_attr_group(modparam_t type, char* _param) rt = pkg_malloc(param.len + sizeof(*rt) + 1); if (!rt) { - ERR("can't allocate PKG memory\n"); + PKG_MEM_ERROR; return -1; } memset(rt, 0, sizeof(*rt)); @@ -461,7 +461,7 @@ int init_extra_avp_locks() locks = shm_malloc(sizeof(gen_lock_t) * LOCK_CNT); if (!locks) { - ERR("can't allocate mutexes\n"); + SHM_MEM_ERROR; return -1; } for (i = 0; i < LOCK_CNT; i++) {

1 0

git:master:fe5027ca: uid_gflags: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: fe5027caf30f6ad4ead271aaa73754707ca140f2 URL: https://github.com/kamailio/kamailio/commit/fe5027caf30f6ad4ead271aaa737547… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 uid_gflags: convert to memory logging helper --- Modified: src/modules/uid_gflags/uid_gflags.c --- Diff: https://github.com/kamailio/kamailio/commit/fe5027caf30f6ad4ead271aaa737547… Patch: https://github.com/kamailio/kamailio/commit/fe5027caf30f6ad4ead271aaa737547… --- diff --git a/src/modules/uid_gflags/uid_gflags.c b/src/modules/uid_gflags/uid_gflags.c index 62f6df0ada..461e9f238b 100644 --- a/src/modules/uid_gflags/uid_gflags.c +++ b/src/modules/uid_gflags/uid_gflags.c @@ -271,20 +271,20 @@ static int mod_init(void) { gflags=(unsigned int *) shm_malloc(sizeof(unsigned int)); if (!gflags) { - LM_ERR("no shared memory\n"); + SHM_MEM_ERROR; return -1; } *gflags=initial; avps_1 = shm_malloc(sizeof(*avps_1)); if (!avps_1) { - LM_ERR("can't allocate memory\n"); + SHM_MEM_ERROR; return -1; } *avps_1 = NULL; avps_2 = shm_malloc(sizeof(*avps_2)); if (!avps_2) { - LM_ERR("can't allocate memory\n"); + SHM_MEM_ERROR; return -1; } *avps_2 = NULL;

1 0

git:master:5357de9c: usrloc: convert to memory logging helper
by Henning Westerholt 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 5357de9c0af801876fec6dab00276c3aa29a87e4 URL: https://github.com/kamailio/kamailio/commit/5357de9c0af801876fec6dab00276c3… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 usrloc: convert to memory logging helper --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/ul_callback.c Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/5357de9c0af801876fec6dab00276c3… Patch: https://github.com/kamailio/kamailio/commit/5357de9c0af801876fec6dab00276c3… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 5148c9d6f0..a4c838e1f6 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -556,7 +556,7 @@ static inline int new_dlist(str* _n, dlist_t** _d) */ ptr = (dlist_t*)shm_malloc(sizeof(dlist_t)); if (ptr == 0) { - LM_ERR("no more share memory\n"); + SHM_MEM_ERROR; return -1; } memset(ptr, 0, sizeof(dlist_t)); @@ -564,7 +564,7 @@ static inline int new_dlist(str* _n, dlist_t** _d) /* copy domain name as null terminated string */ ptr->name.s = (char*)shm_malloc(_n->len+1); if (ptr->name.s == 0) { - LM_ERR("no more memory left\n"); + SHM_MEM_ERROR; shm_free(ptr); return -2; } diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index fe04d2af3d..c95cbb0dd7 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -95,7 +95,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c = (ucontact_t*)shm_malloc(sizeof(ucontact_t)); if (!c) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return 0; } memset(c, 0, sizeof(ucontact_t)); @@ -138,7 +138,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ return c; error: - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; if (c->path.s) shm_free(c->path.s); if (c->received.s) shm_free(c->received.s); if (c->user_agent.s) shm_free(c->user_agent.s); @@ -245,7 +245,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) if ((_old)->len < (_new)->len) { \ ptr = (char*)shm_malloc((_new)->len); \ if (ptr == 0) { \ - LM_ERR("no more shm memory\n"); \ + SHM_MEM_ERROR; \ return -1; \ }\ memcpy(ptr, (_new)->s, (_new)->len);\ diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 80980c4cdf..8050a21ce5 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -55,7 +55,7 @@ static char *build_stat_name( str* domain, char *var_name) n = domain->len + 1 + strlen(var_name) + 1; s = (char*)shm_malloc( n ); if (s==0) { - LM_ERR("no more shm mem\n"); + SHM_MEM_ERROR; return 0; } memcpy( s, domain->s, domain->len); @@ -90,14 +90,14 @@ int new_udomain(str* _n, int _s, udomain_t** _d) */ *_d = (udomain_t*)shm_malloc(sizeof(udomain_t)); if (!(*_d)) { - LM_ERR("new_udomain(): No memory left\n"); + SHM_MEM_ERROR; goto error0; } memset(*_d, 0, sizeof(udomain_t)); (*_d)->table = (hslot_t*)shm_malloc(sizeof(hslot_t) * _s); if (!(*_d)->table) { - LM_ERR("no memory left 2\n"); + SHM_MEM_ERROR; goto error1; } diff --git a/src/modules/usrloc/ul_callback.c b/src/modules/usrloc/ul_callback.c index d00a7ddb40..a3f028b15d 100644 --- a/src/modules/usrloc/ul_callback.c +++ b/src/modules/usrloc/ul_callback.c @@ -44,7 +44,7 @@ int init_ulcb_list(void) ulcb_list = (struct ulcb_head_list*)shm_malloc ( sizeof(struct ulcb_head_list) ); if (ulcb_list==0) { - LM_CRIT("no more shared mem\n"); + SHM_MEM_CRITICAL; return -1; } ulcb_list->first = 0; @@ -92,7 +92,7 @@ int register_ulcb( int types, ul_cb f, void *param ) /* build a new callback structure */ if (!(cbp=(struct ul_callback*)shm_malloc(sizeof( struct ul_callback)))) { - LM_ERR("no more share mem\n"); + SHM_MEM_ERROR; return E_OUT_OF_MEM; } diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index e8e595d74d..afed194734 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -57,14 +57,14 @@ int new_urecord(str* _dom, str* _aor, urecord_t** _r) { *_r = (urecord_t*)shm_malloc(sizeof(urecord_t)); if (*_r == 0) { - LM_ERR("no more share memory\n"); + SHM_MEM_ERROR; return -1; } memset(*_r, 0, sizeof(urecord_t)); (*_r)->aor.s = (char*)shm_malloc(_aor->len); if ((*_r)->aor.s == 0) { - LM_ERR("no more share memory\n"); + SHM_MEM_ERROR; shm_free(*_r); *_r = 0; return -2;

1 0

git:master:6c557efc: dialog: keep route block index as signed int
by Daniel-Constantin Mierla 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 6c557efc1b9cb8c880a05235c94780bbaf305073 URL: https://github.com/kamailio/kamailio/commit/6c557efc1b9cb8c880a05235c94780b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T17:01:49+01: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 --- Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/6c557efc1b9cb8c880a05235c94780b… Patch: https://github.com/kamailio/kamailio/commit/6c557efc1b9cb8c880a05235c94780b… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index 33b36a7ce8..5ecf13f871 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); }

1 0

[kamailio/kamailio] msrp: kamailio cannot create new TCP connection (#2215)
by sergey-safarov 13 Feb '20

13 Feb '20

### Description Kamailio cannot create new `TCP` connection when. 1. used `msrp` module; 1. stated with option `-x tlsf`; Kamailio send `SYN` packet, receive `SYN/ACK` and then Kamailio send `RST` packet. And you will get in log ``` 4(36) DEBUG: <core> [core/ip_addr.c:223]: print_ip(): tcpconn_new: new tcp connection: YYY.YYY.120.101 4(36) DEBUG: <core> [core/tcp_main.c:1174]: tcpconn_new(): on port 2855, type 2 4(36) DEBUG: <core> [core/tcp_main.c:1493]: tcpconn_add(): hashes: 3592:0:0, 3 4(36) DEBUG: <core> [core/tcp_main.c:2885]: tcpconn_1st_send(): pending write on new connection 0x7fab86821eb8 (-1/669 bytes written) (err: 11 - Resource temporarily unavailable) 4(36) ERROR: <core> [core/tcp_main.c:616]: _wbufq_add(): (669 bytes): write queue full or timeout (0, total -2038706176, last write 131535619 s ago) 4(36) ERROR: <core> [core/tcp_main.c:2904]: tcpconn_1st_send(): YYY.YYY.120.101:2855: EAGAIN and write queue full or failed for 0x7fab86821eb8 4(36) DEBUG: <core> [core/tcp_main.c:3171]: tcpconn_chld_put(): destroying connection 0x7fab86821eb8 (3, -1) flags 0060 4(36) ERROR: msrp [msrp_netio.c:180]: msrp_relay(): forwarding frame failed ``` ### Troubleshooting #### Reproduction To reproduce issue need start kamailio with this config. ``` #!KAMAILIO debug=2 memdbg=5 memlog=5 children=4 log_stderror=yes auto_aliases=no tcp_accept_no_cl=yes tcp_connection_lifetime=1810 listen=tcp:eth0:2855 loadmodule "sl.so" loadmodule "msrp.so" loadmodule "pv.so" loadmodule "htable.so" loadmodule "xlog.so" modparam("htable", "htable", "msrp=>size=8;") request_route { sl_send_reply("403", "No SIP Here"); exit; } reply_route { drop; } event_route[msrp:frame-in] { xdbg("============#[[$msrp(method)]]===========\n"); xdbg("============*[[$si:$sp]]\n"); xdbg("============ crthop: [$msrp(crthop)]\n"); xdbg("============ prevhop: [$msrp(prevhop)]\n"); xdbg("============ nexthop: [$msrp(nexthop)]\n"); xdbg("============ firsthop: [$msrp(firsthop)]\n"); xdbg("============ lasthop: [$msrp(lasthop)]\n"); xdbg("============ prevhops: [$msrp(prevhops)]\n"); xdbg("============ nexthops: [$msrp(nexthops)]\n"); xdbg("============ srcaddr: [$msrp(srcaddr)]\n"); xdbg("============ srcsock: [$msrp(srcsock)]\n"); xdbg("============ sessid: [$msrp(sessid)]\n"); msrp_reply_flags("1"); if (msrp_is_reply()) { msrp_relay(); } else if ($msrp(method)=="SEND" || $msrp(method)=="REPORT") { if ($msrp(nexthops)>1) { if ($msrp(method)!="REPORT") { msrp_reply("200", "OK"); } msrp_relay(); exit; } if($msrp(method)!="REPORT") { msrp_reply("200", "OK"); } msrp_relay(); } else { msrp_reply("501", "Request-method-not-understood"); } } ``` And send MSRP message via Kamailio. You will get this output ``` 8(40) DEBUG: <core> [core/ip_addr.c:223]: print_ip(): tcpconn_new: new tcp connection: 91.224.133.8 8(40) DEBUG: <core> [core/tcp_main.c:1174]: tcpconn_new(): on port 51380, type 2 8(40) DEBUG: <core> [core/tcp_main.c:1493]: tcpconn_add(): hashes: 1780:844:2173, 1 8(40) DEBUG: <core> [core/io_wait.h:376]: io_watch_add(): DBG: io_watch_add(0x5647a5dbd800, 16, 2, 0x7fab8681db58), fd_no=12 8(40) DEBUG: <core> [core/io_wait.h:598]: io_watch_del(): DBG: io_watch_del (0x5647a5dbd800, 16, -1, 0x0) fd_no=13 called 8(40) DEBUG: <core> [core/tcp_main.c:4454]: handle_tcpconn_ev(): sending to child, events 1 8(40) DEBUG: <core> [core/tcp_main.c:4124]: send2child(): selected tcp worker idx:0 proc:4 pid:36 for activity on [tcp:XXX.XXX.120.100:2855], 0x7fab8681db58 4(36) DEBUG: <core> [core/tcp_read.c:1759]: handle_io(): received n=8 con=0x7fab8681db58, fd=4 4(36) DEBUG: <core> [core/tcp_read.c:1087]: msrp_process_msg(): MSRP Message: [[>>> MSRP 5279ea9b658f5933 SEND To-Path: msrp://XXX.XXX.120.100:2855/s.8167.4.1897294566;tcp msrp://YYY.YYY.120.101:2855/628b709ee0444396b567545d28cc5bc5;tcp From-Path: msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp Message-ID: 33f0c5fe84311abf Byte-Range: 1-0/0 -------5279ea9b658f5933$ <<<]] 4(36) DEBUG: msrp [msrp_parser.c:165]: msrp_parse_fline(): MSRP FLine: [1] [MSRP] [5279ea9b658f5933] [SEND] [1] [] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a9490f0) [To-Path] [2] [msrp://XXX.XXX.120.100:2855/s.8167.4.1897294566;tcp msrp://YYY.YYY.120.101:2855/628b709ee0444396b567545d28cc5bc5;tcp] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a949170) [From-Path] [1] [msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a9491f0) [Message-ID] [4] [33f0c5fe84311abf] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a95d258) [Byte-Range] [5] [1-0/0] 4(36) DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): SIP Request: 4(36) DEBUG: <core> [core/parser/msg_parser.c:611]: parse_msg(): method: <MSRP> 4(36) DEBUG: <core> [core/parser/msg_parser.c:613]: parse_msg(): uri: <sip:a@127.0.0.1> 4(36) DEBUG: <core> [core/parser/msg_parser.c:615]: parse_msg(): version: <SIP/2.0> 4(36) DEBUG: <core> [core/parser/parse_via.c:1300]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKa>; state=16 4(36) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 4(36) DEBUG: <core> [core/parser/msg_parser.c:498]: parse_headers(): Via found, flags=2 4(36) DEBUG: <core> [core/parser/msg_parser.c:500]: parse_headers(): this is the first via 4(36) DEBUG: msrp [msrp_mod.c:538]: msrp_frame_received(): executing event_route[msrp:frame-in] (1) 4(36) DEBUG: <script>: xlog_helper(): ============#[[SEND]]=========== 4(36) DEBUG: <script>: xlog_helper(): ============*[[91.224.133.8:51380]] 4(36) DEBUG: <script>: xlog_helper(): ============ crthop: [msrp://XXX.XXX.120.100:2855/s.8167.4.1897294566;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ prevhop: [msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ nexthop: [msrp://YYY.YYY.120.101:2855/628b709ee0444396b567545d28cc5bc5;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ firsthop: [msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ lasthop: [msrp://YYY.YYY.120.101:2855/628b709ee0444396b567545d28cc5bc5;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ prevhops: [1] 4(36) DEBUG: <script>: xlog_helper(): ============ nexthops: [1] 4(36) DEBUG: <script>: xlog_helper(): ============ srcaddr: [msrp://91.224.133.8:51380] 4(36) DEBUG: <script>: xlog_helper(): ============ srcsock: [tcp:XXX.XXX.120.100:2855] 4(36) DEBUG: msrp [msrp_parser.c:565]: msrp_parse_uri(): MSRP URI: [msrp] [] [XXX.XXX.120.100] [2855] [s.8167.4.1897294566] [tcp] [] 4(36) DEBUG: <script>: xlog_helper(): ============ sessid: [s.8167.4.1897294566] 4(36) DEBUG: <core> [core/tcp_main.c:1589]: _tcpconn_find(): found connection by id: 1 4(36) DEBUG: <core> [core/tcp_main.c:2470]: tcpconn_send_put(): send from reader (36 (4)), reusing fd 4(36) DEBUG: <core> [core/tcp_main.c:2705]: tcpconn_do_send(): sending... 4(36) DEBUG: <core> [core/tcp_main.c:2738]: tcpconn_do_send(): after real write: c= 0x7fab8681db58 n=232 fd=4 4(36) DEBUG: <core> [core/tcp_main.c:2739]: tcpconn_do_send(): buf= MSRP 5279ea9b658f5933 200 OK To-Path: msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp From-Path: msrp://XXX.XXX.120.100:2855/s.8167.4.1897294566;tcp Message-ID: 33f0c5fe84311abf -------5279ea9b658f5933$ 4(36) DEBUG: msrp [msrp_parser.c:565]: msrp_parse_uri(): MSRP URI: [msrp] [] [YYY.YYY.120.101] [2855] [628b709ee0444396b567545d28cc5bc5] [tcp] [] 4(36) DEBUG: <core> [core/tcp_main.c:1992]: tcp_send(): no open tcp connection found, opening new one 4(36) DEBUG: <core> [core/ip_addr.c:223]: print_ip(): tcpconn_new: new tcp connection: YYY.YYY.120.101 4(36) DEBUG: <core> [core/tcp_main.c:1174]: tcpconn_new(): on port 2855, type 2 4(36) DEBUG: <core> [core/tcp_main.c:1493]: tcpconn_add(): hashes: 3592:0:0, 2 4(36) DEBUG: <core> [core/tcp_main.c:2885]: tcpconn_1st_send(): pending write on new connection 0x7fab86821eb8 (-1/313 bytes written) (err: 11 - Resource temporarily unavailable) 4(36) ERROR: <core> [core/tcp_main.c:616]: _wbufq_add(): (313 bytes): write queue full or timeout (0, total -2038706176, last write 131535619 s ago) 4(36) ERROR: <core> [core/tcp_main.c:2904]: tcpconn_1st_send(): YYY.YYY.120.101:2855: EAGAIN and write queue full or failed for 0x7fab86821eb8 4(36) DEBUG: <core> [core/tcp_main.c:3171]: tcpconn_chld_put(): destroying connection 0x7fab86821eb8 (2, -1) flags 0060 4(36) ERROR: msrp [msrp_netio.c:180]: msrp_relay(): forwarding frame failed 4(36) DEBUG: <core> [core/io_wait.h:376]: io_watch_add(): DBG: io_watch_add(0x5647a5e01ba0, 4, 2, 0x7fab8681db58), fd_no=1 4(36) DEBUG: <core> [core/tcp_read.c:1087]: msrp_process_msg(): MSRP Message: [[>>> MSRP 7a06bb2f2057775 SEND To-Path: msrp://XXX.XXX.120.100:2855/s.8167.4.1897294566;tcp msrp://YYY.YYY.120.101:2855/628b709ee0444396b567545d28cc5bc5;tcp From-Path: msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp Message-ID: c019ad9285cb154e Byte-Range: 1-282/282 Success-Report: no Failure-Report: no Content-Type: message/cpim From: dell <sip:+12134567788@example.com> To: <sip:+12134237682@example.com> DateTime: 2020-02-08T18:08:29.321289+03:00 MIME-Version: 1.0 Content-Type: text/plain ?OTRv3? I would like to start an Off-the-Record private conversation, but you do not seem to support that. -------7a06bb2f2057775$ <<<]] 4(36) DEBUG: msrp [msrp_parser.c:165]: msrp_parse_fline(): MSRP FLine: [1] [MSRP] [7a06bb2f2057775] [SEND] [1] [] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a9490f0) [To-Path] [2] [msrp://XXX.XXX.120.100:2855/s.8167.4.1897294566;tcp msrp://YYY.YYY.120.101:2855/628b709ee0444396b567545d28cc5bc5;tcp] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a949170) [From-Path] [1] [msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a9491f0) [Message-ID] [4] [c019ad9285cb154e] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a95d258) [Byte-Range] [5] [1-282/282] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a95d2d8) [Success-Report] [7] [no] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a95d358) [Failure-Report] [0] [no] 4(36) DEBUG: msrp [msrp_parser.c:325]: msrp_parse_headers(): MSRP Header: (0x7fab8a95d3d8) [Content-Type] [8] [message/cpim] 4(36) DEBUG: msrp [msrp_parser.c:355]: msrp_parse_headers(): MSRP Body: [284] [[ From: dell <sip:+12134567788@example.com> To: <sip:+12134237682@example.com> DateTime: 2020-02-08T18:08:29.321289+03:00 MIME-Version: 1.0 Content-Type: text/plain ?OTRv3? I would like to start an Off-the-Record private conversation, but you do not seem to support that. ]] 4(36) DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): SIP Request: 4(36) DEBUG: <core> [core/parser/msg_parser.c:611]: parse_msg(): method: <MSRP> 4(36) DEBUG: <core> [core/parser/msg_parser.c:613]: parse_msg(): uri: <sip:a@127.0.0.1> 4(36) DEBUG: <core> [core/parser/msg_parser.c:615]: parse_msg(): version: <SIP/2.0> 4(36) DEBUG: <core> [core/parser/parse_via.c:1300]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKa>; state=16 4(36) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 4(36) DEBUG: <core> [core/parser/msg_parser.c:498]: parse_headers(): Via found, flags=2 4(36) DEBUG: <core> [core/parser/msg_parser.c:500]: parse_headers(): this is the first via 4(36) DEBUG: msrp [msrp_mod.c:538]: msrp_frame_received(): executing event_route[msrp:frame-in] (1) 4(36) DEBUG: <script>: xlog_helper(): ============#[[SEND]]=========== 4(36) DEBUG: <script>: xlog_helper(): ============*[[91.224.133.8:51380]] 4(36) DEBUG: <script>: xlog_helper(): ============ crthop: [msrp://XXX.XXX.120.100:2855/s.8167.4.1897294566;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ prevhop: [msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ nexthop: [msrp://YYY.YYY.120.101:2855/628b709ee0444396b567545d28cc5bc5;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ firsthop: [msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ lasthop: [msrp://YYY.YYY.120.101:2855/628b709ee0444396b567545d28cc5bc5;tcp] 4(36) DEBUG: <script>: xlog_helper(): ============ prevhops: [1] 4(36) DEBUG: <script>: xlog_helper(): ============ nexthops: [1] 4(36) DEBUG: <script>: xlog_helper(): ============ srcaddr: [msrp://91.224.133.8:51380] 4(36) DEBUG: <script>: xlog_helper(): ============ srcsock: [tcp:XXX.XXX.120.100:2855] 4(36) DEBUG: msrp [msrp_parser.c:565]: msrp_parse_uri(): MSRP URI: [msrp] [] [XXX.XXX.120.100] [2855] [s.8167.4.1897294566] [tcp] [] 4(36) DEBUG: <script>: xlog_helper(): ============ sessid: [s.8167.4.1897294566] 4(36) DEBUG: <core> [core/tcp_main.c:1589]: _tcpconn_find(): found connection by id: 1 4(36) DEBUG: <core> [core/tcp_main.c:2470]: tcpconn_send_put(): send from reader (36 (4)), reusing fd 4(36) DEBUG: <core> [core/tcp_main.c:2705]: tcpconn_do_send(): sending... 4(36) DEBUG: <core> [core/tcp_main.c:2738]: tcpconn_do_send(): after real write: c= 0x7fab8681db58 n=230 fd=4 4(36) DEBUG: <core> [core/tcp_main.c:2739]: tcpconn_do_send(): buf= MSRP 7a06bb2f2057775 200 OK To-Path: msrp://192.168.122.2:2855/4bc8884925ca0aeb314d;tcp From-Path: msrp://XXX.XXX.120.100:2855/s.8167.4.1897294566;tcp Message-ID: c019ad9285cb154e -------7a06bb2f2057775$ 4(36) DEBUG: msrp [msrp_parser.c:565]: msrp_parse_uri(): MSRP URI: [msrp] [] [YYY.YYY.120.101] [2855] [628b709ee0444396b567545d28cc5bc5] [tcp] [] 4(36) DEBUG: <core> [core/tcp_main.c:1992]: tcp_send(): no open tcp connection found, opening new one 4(36) DEBUG: <core> [core/ip_addr.c:223]: print_ip(): tcpconn_new: new tcp connection: YYY.YYY.120.101 4(36) DEBUG: <core> [core/tcp_main.c:1174]: tcpconn_new(): on port 2855, type 2 4(36) DEBUG: <core> [core/tcp_main.c:1493]: tcpconn_add(): hashes: 3592:0:0, 3 4(36) DEBUG: <core> [core/tcp_main.c:2885]: tcpconn_1st_send(): pending write on new connection 0x7fab86821eb8 (-1/669 bytes written) (err: 11 - Resource temporarily unavailable) 4(36) ERROR: <core> [core/tcp_main.c:616]: _wbufq_add(): (669 bytes): write queue full or timeout (0, total -2038706176, last write 131535619 s ago) 4(36) ERROR: <core> [core/tcp_main.c:2904]: tcpconn_1st_send(): YYY.YYY.120.101:2855: EAGAIN and write queue full or failed for 0x7fab86821eb8 4(36) DEBUG: <core> [core/tcp_main.c:3171]: tcpconn_chld_put(): destroying connection 0x7fab86821eb8 (3, -1) flags 0060 4(36) ERROR: msrp [msrp_netio.c:180]: msrp_relay(): forwarding frame failed ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` /etc/kamailio # kamailio -v version: kamailio 5.4.0-dev3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, 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 on 19:57:02 Feb 6 2020 with gcc 9.2.0 ``` * **Operating System**: ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.12_alpha20200122 PRETTY_NAME="Alpine Linux edge" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://bugs.alpinelinux.org/" ``` Kamailio packaged into docker container `kamailio/kamailio-ci:master-alpine.debug`. Commit e9a19d5b4ebff9e06a061efdc5f2b91d4e1bf1b2 -- 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/2215

3 7

git: new commits in branch master
by Daniel-Constantin Mierla 13 Feb '20

13 Feb '20

- URL: https://github.com/kamailio/kamailio/commit/b88b2306a0bdd8ba8df92cfeb60eb40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 test/mod_httpapitest: removed unused xml2-config discovery - URL: https://github.com/kamailio/kamailio/commit/58deac2e7fd62afca409b17903deb95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 lib/ims: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/2749962b8354be1731ab68a0ae4aa0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 cdp: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/f05a46dc79de45c6cb958b845b9f2d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 cplc: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/4d3496fb82df1d249a78365e0c50b4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 ims_auth: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/80f2eb33a967ede3e70fef572dc9b42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 ims_icscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/71e67531194aa867b8f3f32b72d07e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 ims_isc: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/29573bbdb09412c9cbfe839f0c80b7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 ims_registrar_pcscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/ff92622c3b4c6224f75318ba9e39c9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 ims_registrar_scscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/8d7c0f80083351de98b99d2505170b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 lost: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/8e9e1fdeacc4c1b2b0cd67f1b36d737… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 presence_conference: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/4f43047172260e1a524700a866693f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 pua: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/e00ce6016afd5c0fba084a19a45fb13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 pua_bla: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/b4842e81e3aa861739c996ff795b6d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 pua_dialoginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/7f6648a8586fdfd5a1fdba055563330… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 pua_reginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/20d9453cd3259e8afa1de92a7dba1d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 pua_usrloc: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/d40a924bd698ddf365b4db52cba2ab4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 pua_xmpp: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/fbfe21f54c7fd845bf9c99c4091980b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 rls: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/169ccce5e3cb302352b1e4d5ac0a0dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 xcap_server: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/fe173b2af121b2d6388fea3632037a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 xhttp_pi: Makefile - use pkg-config if xml2-config is not found - GH #2199 - URL: https://github.com/kamailio/kamailio/commit/994a8dfc070d84b5dad28fa873d8759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T10:26:41+01:00 xmlrpc: Makefile - use pkg-config if xml2-config is not found - GH #2199

1 0

git:master:ed4559a7: pv_headers: store To info in xavp_parsed_name.r on replies
by Victor Seva 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: ed4559a76c32d0addc14a0fae9982b081edc511b URL: https://github.com/kamailio/kamailio/commit/ed4559a76c32d0addc14a0fae9982b0… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-13T09:25:31+01:00 pv_headers: store To info in xavp_parsed_name.r on replies pvh_get_uri was using xavp_parsed_name since xavp_parsed_name.r didn't exist so $x_tt was not there * some refactoring to reduce duplication * skip trying to get the same xavp when br_xname and xname are the same * add more debug, some commented just in case We needed it later Change-Id: I961d176204ddb5d4f726061c413be765187b27ac --- Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/ed4559a76c32d0addc14a0fae9982b0… Patch: https://github.com/kamailio/kamailio/commit/ed4559a76c32d0addc14a0fae9982b0…

1 0

git:master:9fb8eb4a: pv_headers: fix detection of branch flag on collect
by Victor Seva 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 9fb8eb4a8db659b4e93c24d0d83d24bcff8149ef URL: https://github.com/kamailio/kamailio/commit/9fb8eb4a8db659b4e93c24d0d83d24b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-13T09:22:43+01:00 pv_headers: fix detection of branch flag on collect --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb8eb4a8db659b4e93c24d0d83d24b… Patch: https://github.com/kamailio/kamailio/commit/9fb8eb4a8db659b4e93c24d0d83d24b… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 1340500cc4..22ee74e42d 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -51,7 +51,7 @@ int pvh_collect_headers(struct sip_msg *msg, int is_auto) return -1; } } else { - if(isbflagset(br_idx, FL_PV_HDRS_COLLECTED)) { + if(isbflagset(br_idx, FL_PV_HDRS_COLLECTED) == 1) { LM_ERR("headers are already collected\n"); return -1; }

1 0

git:master:03647b03: core: tcp - init value of *tcp_total_wq after allocation
by Daniel-Constantin Mierla 13 Feb '20

13 Feb '20

Module: kamailio Branch: master Commit: 03647b03c0ede9e2d5f65766ce6b72c593e3f39c URL: https://github.com/kamailio/kamailio/commit/03647b03c0ede9e2d5f65766ce6b72c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T09:10:52+01:00 core: tcp - init value of *tcp_total_wq after allocation - use %u to log unsigned variables --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/03647b03c0ede9e2d5f65766ce6b72c… Patch: https://github.com/kamailio/kamailio/commit/03647b03c0ede9e2d5f65766ce6b72c… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 4ebd6b7baf..e57a29d99e 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -613,8 +613,8 @@ inline static int _wbufq_add(struct tcp_connection* c, const char* data, ((*tcp_total_wq+size)>cfg_get(tcp, tcp_cfg, tcp_wq_max)) || (q->first && TICKS_LT(q->wr_timeout, t)) )){ - LM_ERR("(%d bytes): write queue full or timeout " - " (%d, total %d, last write %d s ago)\n", + LM_ERR("(%u bytes): write queue full or timeout " + " (%u, total %u, last write %d s ago)\n", size, q->queued, *tcp_total_wq, TICKS_TO_S(t-(q->wr_timeout- cfg_get(tcp, tcp_cfg, send_timeout)))); @@ -4947,6 +4947,7 @@ int init_tcp() SHM_MEM_CRITICAL; goto error; } + *tcp_total_wq=0; #endif /* TCP_ASYNC */ /* alloc hashtables*/ tcpconn_aliases_hash=(struct tcp_conn_alias**)

1 0

[kamailio/kamailio] Kemi: sdp_with_transport() missing and sdp_transport() doesn't always help (#2194)
by Sebastian Damm 12 Feb '20

12 Feb '20

### Description In plain Kamailio language, we used the following line: ``` if ( sdp_with_transport("RTP/SAVP") ) { ``` Now we wanted to convert that to Kemi. Turns out, the `sdp_with_transport()` function is not exported to Kemi. So we thought, we could use `sdp_transport()` to work around the missing function. This works as long as there is only one transport in SDP. But if a phone sends two media streams in SDP, one with RTP/AVP and one with RTP/SAVP, `sdp_transport()` will return `-2`. ### Troubleshooting #### Reproduction Send an INVITE to Kamailio and try to get the transport type into a variable with ` sdp_transport()`. This can be done for example with a snom phone where in the rtp section of the identity configuration the parameter "RTP/SAVP" is set to "optional". #### Log Messages ``` Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: app_jsdt [app_jsdt_api.c:996]: sr_kemi_jsdt_exec_func_ex(): param[0] for: sdp_transport is str: $avp(mediaTransport) Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: <core> [core/usr_avp.c:887]: parse_avp_ident(): Parsing 'mediaTransport' Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: <core> [core/pvapi.c:368]: pv_cache_add(): pvar [$avp(mediaTransport)] added in cache Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: sdpops [sdpops_mod.c:1214]: sdp_transport_helper(): stream 0 of 0 - transport [RTP/SAVP] Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: sdpops [sdpops_mod.c:1214]: sdp_transport_helper(): stream 1 of 0 - transport [RTP/AVP] Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: sdpops [sdpops_mod.c:1219]: sdp_transport_helper(): no common transport ``` ### Additional Information We are still running Kamailio 5.1.x, but as far as I could see, the behavior has not changed since then. -- 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/2194

2 2

git:master:c2f0b7b6: sdpops: exported sdp with transport variants to kemi
by Daniel-Constantin Mierla 12 Feb '20

12 Feb '20

Module: kamailio Branch: master Commit: c2f0b7b6e41e334c8e0695feae3b5e6d4e8a74dc URL: https://github.com/kamailio/kamailio/commit/c2f0b7b6e41e334c8e0695feae3b5e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T22:15:24+01:00 sdpops: exported sdp with transport variants to kemi - GH #2194 --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c2f0b7b6e41e334c8e0695feae3b5e6… Patch: https://github.com/kamailio/kamailio/commit/c2f0b7b6e41e334c8e0695feae3b5e6… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 1492ec0832..bebe01ba5c 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -1323,6 +1323,26 @@ static int w_sdp_with_transport_like(sip_msg_t* msg, char* transport, char *bar) return 1; } +/** + * + */ +static int ki_sdp_with_transport(sip_msg_t* msg, str* transport) +{ + if(sdp_with_transport(msg, transport, 0)<=0) + return -1; + return 1; +} + +/** + * + */ +static int ki_sdp_with_transport_like(sip_msg_t* msg, str* transport) +{ + if(sdp_with_transport(msg, transport, 1)<=0) + return -1; + return 1; +} + /** * @brief remove streams matching the m=media port 'transport' * @return -1 - error; 0 - not found; >=1 - found @@ -2230,6 +2250,16 @@ static sr_kemi_t sr_kemi_sdpops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sdpops"), str_init("sdp_with_transport"), + SR_KEMIP_INT, ki_sdp_with_transport, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("sdp_with_transport_like"), + SR_KEMIP_INT, ki_sdp_with_transport_like, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sdpops"), str_init("sdp_get_line_startswith"), SR_KEMIP_INT, ki_sdp_get_line_startswith, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:4bf0c5c9: core: tcp - print socked fd on logs when writing to tcp conenction
by Daniel-Constantin Mierla 12 Feb '20

12 Feb '20

Module: kamailio Branch: master Commit: 4bf0c5c9e573d587e271400aa55fb56a0fc9601d URL: https://github.com/kamailio/kamailio/commit/4bf0c5c9e573d587e271400aa55fb56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:56:14+01:00 core: tcp - print socked fd on logs when writing to tcp conenction --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/4bf0c5c9e573d587e271400aa55fb56… Patch: https://github.com/kamailio/kamailio/commit/4bf0c5c9e573d587e271400aa55fb56… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e0a66be619..4ebd6b7baf 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1171,7 +1171,7 @@ struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su, } } print_ip("tcpconn_new: new tcp connection: ", &c->rcv.src_ip, "\n"); - LM_DBG("on port %d, type %d\n", c->rcv.src_port, type); + LM_DBG("on port %d, type %d, socket %d\n", c->rcv.src_port, type, sock); init_tcp_req(&c->req, (char*)c+sizeof(struct tcp_connection), rd_b_size); c->id=(*connection_id)++; c->rcv.proto_reserved1=0; /* this will be filled before receive_message*/ @@ -2874,7 +2874,7 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, int locked) { int n; - + n=_tcpconn_write_nb(fd, c, buf, len); if (unlikely(n<(int)len)){ /* on EAGAIN or ENOTCONN return success. @@ -2882,12 +2882,12 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, connect() & send immediately) */ if ((n>=0) || errno==EAGAIN || errno==EWOULDBLOCK || errno==ENOTCONN){ if(n<0) { - LM_DBG("pending write on new connection %p " - "(%d/%d bytes written) (err: %d - %s)\n", c, n, len, + LM_DBG("pending write on new connection %p sock %d " + "(%d/%d bytes written) (err: %d - %s)\n", c, fd, n, len, errno, strerror(errno)); } else { - LM_DBG("pending write on new connection %p " - "(%d/%d bytes written)\n", c, n, len); + LM_DBG("pending write on new connection %p sock %d " + "(%d/%d bytes written)\n", c, fd, n, len); } if (unlikely(n<0)) n=0; else{ @@ -2901,8 +2901,9 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, if (unlikely(_wbufq_insert(c, buf+n, len-n)<0)){ if (likely(!locked)) lock_release(&c->write_lock); n=-1; - LM_ERR("%s: EAGAIN and write queue full or failed for %p\n", - su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), c); + LM_ERR("%s: EAGAIN and write queue full or failed for %p" + " sock %d\n", su2a(&c->rcv.src_su, + sizeof(c->rcv.src_su)), c, fd); goto error; } if (likely(!locked)) lock_release(&c->write_lock); @@ -2939,12 +2940,12 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, } /* error: destroy it directly */ TCP_STATS_CONNECT_FAILED(); - LM_ERR("%s: connect & send for %p failed:" " %s (%d)\n", + LM_ERR("%s: connect & send for %p (sock %d) failed:" " %s (%d)\n", su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), - c, strerror(errno), errno); + c, fd, strerror(errno), errno); goto error; } - LM_INFO("quick connect for %p\n", c); + LM_INFO("quick connect for %p sock %d\n", c, fd); if (likely(c->state == S_CONN_CONNECT)) TCP_STATS_ESTABLISHED(S_CONN_CONNECT); if (unlikely(send_flags.f & SND_F_CON_CLOSE)){

1 0

git:master:02cf454f: utils: Makefile - try to use pkg-config if xml2-config is not found
by Daniel-Constantin Mierla 12 Feb '20

12 Feb '20

Module: kamailio Branch: master Commit: 02cf454fc601dd3b246a8886ec6d86103ad87a6e URL: https://github.com/kamailio/kamailio/commit/02cf454fc601dd3b246a8886ec6d861… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:30:09+01:00 utils: Makefile - try to use pkg-config if xml2-config is not found --- Modified: src/modules/utils/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/02cf454fc601dd3b246a8886ec6d861… Patch: https://github.com/kamailio/kamailio/commit/02cf454fc601dd3b246a8886ec6d861… --- diff --git a/src/modules/utils/Makefile b/src/modules/utils/Makefile index cfcfdd1f3d..85d0eb065c 100644 --- a/src/modules/utils/Makefile +++ b/src/modules/utils/Makefile @@ -10,6 +10,12 @@ NAME=utils.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(XML2CFG),) +XML2CFG=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif endif ifneq ($(XML2CFG),)

1 0

git:master:517283c2: presence_dialoginfo: Makefile - try to use pkg-config if xml2-config is not found
by Daniel-Constantin Mierla 12 Feb '20

12 Feb '20

Module: kamailio Branch: master Commit: 517283c245be8c35d3c6ee9721fa1e85865b4638 URL: https://github.com/kamailio/kamailio/commit/517283c245be8c35d3c6ee9721fa1e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:29:53+01:00 presence_dialoginfo: Makefile - try to use pkg-config if xml2-config is not found --- Modified: src/modules/presence_dialoginfo/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/517283c245be8c35d3c6ee9721fa1e8… Patch: https://github.com/kamailio/kamailio/commit/517283c245be8c35d3c6ee9721fa1e8… --- diff --git a/src/modules/presence_dialoginfo/Makefile b/src/modules/presence_dialoginfo/Makefile index 32ecedfba2..93232b2e7a 100644 --- a/src/modules/presence_dialoginfo/Makefile +++ b/src/modules/presence_dialoginfo/Makefile @@ -1,4 +1,4 @@ -# +# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs @@ -7,6 +7,12 @@ NAME=presence_dialoginfo.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(XML2CFG),) +XML2CFG=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif endif ifneq ($(XML2CFG),)

1 0

git:master:5ce96902: presence: Makefile - try to use pkg-config if xml2-config is not found
by Daniel-Constantin Mierla 12 Feb '20

12 Feb '20

Module: kamailio Branch: master Commit: 5ce9690245e0a075742c7cb8eac1786622c976f4 URL: https://github.com/kamailio/kamailio/commit/5ce9690245e0a075742c7cb8eac1786… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:29:25+01:00 presence: Makefile - try to use pkg-config if xml2-config is not found --- Modified: src/modules/presence/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5ce9690245e0a075742c7cb8eac1786… Patch: https://github.com/kamailio/kamailio/commit/5ce9690245e0a075742c7cb8eac1786… --- diff --git a/src/modules/presence/Makefile b/src/modules/presence/Makefile index bf5586a32f..3cc6ae6c19 100644 --- a/src/modules/presence/Makefile +++ b/src/modules/presence/Makefile @@ -7,6 +7,12 @@ NAME=presence.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(XML2CFG),) +XML2CFG=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif ifeq ($(OS), darwin) ICU_BUILDER = $(shell \ if pkg-config --exists icu-uc; then \

1 0

git:master:77ad9e62: presence_xml: Makefile - try to use pkg-config if xml2-config is not found
by Daniel-Constantin Mierla 12 Feb '20

12 Feb '20

Module: kamailio Branch: master Commit: 77ad9e626a8b9f26f3ce904fe35dda70ad4ce164 URL: https://github.com/kamailio/kamailio/commit/77ad9e626a8b9f26f3ce904fe35dda7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:29:39+01:00 presence_xml: Makefile - try to use pkg-config if xml2-config is not found --- Modified: src/modules/presence_xml/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/77ad9e626a8b9f26f3ce904fe35dda7… Patch: https://github.com/kamailio/kamailio/commit/77ad9e626a8b9f26f3ce904fe35dda7… --- diff --git a/src/modules/presence_xml/Makefile b/src/modules/presence_xml/Makefile index f6a1dd4d63..826df4d0ad 100644 --- a/src/modules/presence_xml/Makefile +++ b/src/modules/presence_xml/Makefile @@ -8,6 +8,12 @@ LIBS= ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(XML2CFG),) +XML2CFG=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif ifeq ($(OS), darwin) ICU_BUILDER = $(shell \ if pkg-config --exists icu-uc; then \

1 0

git:master:64d37971: xmlops: Makefile - try to use pkg-config if xml2-config is not found
by Daniel-Constantin Mierla 12 Feb '20

12 Feb '20

Module: kamailio Branch: master Commit: 64d37971d2d3fbd87176fe71ae19adca7f47a6ea URL: https://github.com/kamailio/kamailio/commit/64d37971d2d3fbd87176fe71ae19adc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T20:56:05+01:00 xmlops: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 --- Modified: src/modules/xmlops/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/64d37971d2d3fbd87176fe71ae19adc… Patch: https://github.com/kamailio/kamailio/commit/64d37971d2d3fbd87176fe71ae19adc… --- diff --git a/src/modules/xmlops/Makefile b/src/modules/xmlops/Makefile index d31550301b..1ac9539202 100644 --- a/src/modules/xmlops/Makefile +++ b/src/modules/xmlops/Makefile @@ -9,20 +9,22 @@ NAME=xmlops.so LIBS= ifeq ($(CROSS_COMPILE),) -XML2CFG=$(shell which xml2-config) +PKGCFGTOOL=$(shell which xml2-config) +ifeq ($(PKGCFGTOOL),) +PKGCFGTOOL=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif endif -ifneq ($(XML2CFG),) - - DEFS += $(shell $(XML2CFG) --cflags ) - LIBS += $(shell $(XML2CFG) --libs) - +ifneq ($(PKGCFGTOOL),) + DEFS += $(shell $(PKGCFGTOOL) --cflags ) + LIBS += $(shell $(PKGCFGTOOL) --libs) else - DEFS+=-I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include LIBS+=-L$(LOCALBASE)/lib -lxml2 - endif include ../../Makefile.modules

1 0

Build failed in Jenkins: kamailio51-repos » amd64,stretch,master #12
by kamailio＠sipwise.com 12 Feb '20

12 Feb '20

See <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> Changes: ------------------------------------------ Started by upstream project "kamailio51-repos" build number 12 originally caused by: Started by upstream project "kamailio51-binaries" build number 12 originally caused by: Started by upstream project "kamailio51-source" build number 13 originally caused by: Started by an SCM change Running as SYSTEM Building on master in workspace <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> [master] $ /bin/sh -xe /tmp/jenkins8204542435066925893.sh + echo * Removing files workspace before copying artifacts from another project. * * Removing files workspace before copying artifacts from another project. * + rm -f ./* Copied 48 artifacts from "kamailio51-binaries » amd64,stretch,slave" build number 12 [master] $ /bin/sh -xe /tmp/jenkins3004813930446104702.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-repository + set -e + '[' -z /srv/repository/kamailio51 ']' + repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + echo '*** Sourcing /etc/jenkins/debian_glue ***' *** Sourcing /etc/jenkins/debian_glue *** + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio51 ']' + false + '[' '' = true ']' + ARCHITECTURES='amd64 i386 source' + COMPONENTS=main + UDEB_COMPONENTS=main + '[' 1 -gt 1 ']' + '[' 1 -lt 1 ']' + REPOS=stretch ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.20.0+0~20190716175216.345~1.gbp31b905 + '[' -n 0.20.0+0~20190716175216.345~1.gbp31b905 ']' + echo '*** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 ***' *** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 *** + '[' -z '' ']' + echo '*** Repository variable DEFAULT_REPOSITORY is unset, using default [] ***' *** Repository variable DEFAULT_REPOSITORY is unset, using default [] *** + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio51 ']' + mkdir -p /srv/repository/kamailio51/conf ++ id -un + chown jenkins /srv/repository/kamailio51/conf + touch /srv/repository/kamailio51/conf/distributions + '[' -z 508EA4C8 ']' ++ id -un + flock --timeout 5 9 + grep -q '^$Codename\|Suite$: stretch$' /srv/repository/kamailio51/conf/distributions + echo 'Codename/repository stretch exists already, ignoring request to add again.' Codename/repository stretch exists already, ignoring request to add again. + exit 0 ++ id -un + rm -f /var/lock/jdg-generate-reprepro-codename.jenkins + set -u + umask 022 + PATH=/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin + export QEMU_RESERVED_VA=0x0 + QEMU_RESERVED_VA=0x0 + export TERM=dumb + TERM=dumb ++ date + echo '*** Starting /usr/bin/build-and-provide-package at Fri Nov 8 03:43:35 UTC 2019 ***' *** Starting /usr/bin/build-and-provide-package at Fri Nov 8 03:43:35 UTC 2019 *** ++ sed -e 's/^$[0-9]*$.*/\1/' + start_seconds=9792224 ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.20.0+0~20190716175216.345~1.gbp31b905 + '[' -n 0.20.0+0~20190716175216.345~1.gbp31b905 ']' + echo '*** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 ***' *** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 *** ++ dpkg --print-architecture + HOST_ARCH=amd64 + '[' -n amd64 ']' + echo '*** Identified host architecture amd64 ***' *** Identified host architecture amd64 *** + trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM + checks_and_defaults + '[' -z /srv/repository/kamailio51 ']' + local repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio51 ']' + false + '[' -n '' ']' + '[' -z kamailio51-repos/architecture=amd64,distribution=stretch,label=master ']' + '[' -z amd64 ']' + set_debootstrap + '[' -n '' ']' + '[' amd64 = amd64 ']' + DEBOOTSTRAP=debootstrap + return 0 + '[' -z '' ']' + REPREPRO_OPTS='-v --waitforlock 1000' + echo '*** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 ***' *** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 *** + REPREPRO_CMD=reprepro + '[' -z '' ']' + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio51 ']' + '[' -z '' ']' + PBUILDER_HOOKDIR=/usr/share/jenkins-debian-glue/pbuilder-hookdir/ + '[' -z '' ']' + '[' -z '' ']' + FREIGHT_VARLIB=/var/lib/freight + FREIGHT_VARCACHE=/var/cache/freight + FREIGHT_CONF=/etc/freight.conf + '[' '' = true ']' + clean_workspace ++ pwd + echo '*** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…]>: ***' *** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…]>: *** + ls -la ./ total 12 drwxr-xr-x 3 jenkins jenkins 4096 Nov 8 03:43 . drwxr-xr-x 3 jenkins jenkins 4096 Nov 8 03:43 .. drwxr-xr-x 2 jenkins jenkins 4096 Nov 8 03:43 binaries + identify_package_name + PACKAGE=kamailio51 + PACKAGE=kamailio51 + '[' -n kamailio51 ']' + echo '*** Identified Debian package name kamailio51 ***' *** Identified Debian package name kamailio51 *** + set_base_path + '[' -n binaries/ ']' + echo '*** Using provided binaries/ as BASE_PATH ***' *** Using provided binaries/ as BASE_PATH *** + build_info + '[' -n stretch ']' + echo '*** Using supplied repository name stretch ***' *** Using supplied repository name stretch *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' binaries//kamailio_5.1.9+stretch.dsc + SOURCE_PACKAGE=kamailio ++ basename binaries//kamailio_5.1.9+stretch.dsc .dsc + p=kamailio_5.1.9+stretch + '[' kamailio_5.1.9+stretch = '*' ']' + cur_version=5.1.9+stretch + '[' -z '' ']' + newest_version=5.1.9+stretch + echo '*** Found package version 5.1.9+stretch ***' *** Found package version 5.1.9+stretch *** + sourcefile='binaries//kamailio_*5.1.9+stretch.dsc' + echo '*** Using binaries//kamailio_*5.1.9+stretch.dsc (version: 5.1.9+stretch)' *** Using binaries//kamailio_*5.1.9+stretch.dsc (version: 5.1.9+stretch) + dist_and_arch_settings + '[' -z amd64 ']' + '[' amd64 = all ']' + arch=amd64 + echo '*** architecture is set to amd64 ***' *** architecture is set to amd64 *** + '[' -n stretch ']' + local DIST=stretch + '[' -n '' ']' + echo '*** Using cowbuilder base for distribution stretch ***' *** Using cowbuilder base for distribution stretch *** + COWBUILDER_DIST=stretch + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-stretch-amd64.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-stretch-amd64.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-stretch-amd64.cow as cowbuilder base.cow *** + local lockfiles=/var/run/lock/stretch-amd64 + build_lockfile=/var/run/lock/stretch-amd64.building.15285 + update_lockfile=/var/run/lock/stretch-amd64.update + update_lockfile_pid=/var/run/lock/stretch-amd64.update.15285 + '[' -n true ']' + echo '*** Config variable '\''PROVIDE_ONLY'\'' is set, ignoring request to run cowbuilder. ***' *** Config variable 'PROVIDE_ONLY' is set, ignoring request to run cowbuilder. *** + '[' -n '' ']' + deploy_to_releases + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + reprepro_wrapper + '[' -n '' ']' + '[' -d /srv/repository/kamailio51 ']' + '[' -r /srv/repository/kamailio51/conf/distributions ']' + grep -q '^$Codename\|Suite$: stretch$' /srv/repository/kamailio51/conf/distributions + remove_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_REMOVAL *** + return 0 + remove_missing_binary_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL *** + return 0 + echo '*** Including packages in repository stretch ***' *** Including packages in repository stretch *** ++ get_arch_changes ++ case ${architecture} in ++ echo amd64 + reprepro -b /srv/repository/kamailio51 -v --waitforlock 1000 --ignore=wrongdistribution --ignore=uploaders --ignore=surprisingbinary include stretch <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> .changes put in a distribution not listed within it! Ignoring as --ignore=wrongdistribution given. File "pool/main/k/kamailio/kamailio_5.1.9+stretch_amd64.deb" is already registered with different checksums! md5 expected: 9f7f4b9dfb32f803794ae13b65ddef34, got: 98989d9a19ac4f71f14860267852c809 sha1 expected: 4f074e5a058b8cfa7f630673e17bfba2180ef38a, got: b4f0098aba959de10c479bec2bec997926852309 sha256 expected: 44d2cf6c140f68d34f35632dfc0a1a39b61dff166eb0a6f7008c2c6ea5270a26, got: 816153949f452835390306799d0c1f5a2ff5846a3ba8f6d5f5bcb4863ebcf4d9 size expected: 6017838, got: 6017960 There have been errors! + '[' 254 -eq 0 ']' + bailout 1 'Error: Failed to include binary package in stretch repository.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to include binary package in stretch repository.' ']' + echo 'Error: Failed to include binary package in stretch repository.' Error: Failed to include binary package in stretch repository. + rm -f /var/run/lock/stretch-amd64.building.15285 + '[' -r /var/run/lock/stretch-amd64.update.15285 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> to avoid problems in next run. *** + rm -f <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> + '[' -n '' ']' + '[' -n '' ']' + '[' -n 9792224 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=0 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Fri Nov 8 03:43:35 UTC 2019 [running 0 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Fri Nov 8 03:43:35 UTC 2019 [running 0 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts

1 1

Build failed in Jenkins: kamailio51-repos » i386,trusty,master #12
by kamailio＠sipwise.com 12 Feb '20

12 Feb '20

See <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> Changes: ------------------------------------------ Started by upstream project "kamailio51-repos" build number 12 originally caused by: Started by upstream project "kamailio51-binaries" build number 12 originally caused by: Started by upstream project "kamailio51-source" build number 13 originally caused by: Started by an SCM change Running as SYSTEM Building on master in workspace <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> [master] $ /bin/sh -xe /tmp/jenkins7029605092082767783.sh + echo * Removing files workspace before copying artifacts from another project. * * Removing files workspace before copying artifacts from another project. * + rm -f ./* Copied 44 artifacts from "kamailio51-binaries » i386,trusty,slave" build number 12 [master] $ /bin/sh -xe /tmp/jenkins4596674489248252081.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-repository + set -e + '[' -z /srv/repository/kamailio51 ']' + repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + echo '*** Sourcing /etc/jenkins/debian_glue ***' *** Sourcing /etc/jenkins/debian_glue *** + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio51 ']' + false + '[' '' = true ']' + ARCHITECTURES='amd64 i386 source' + COMPONENTS=main + UDEB_COMPONENTS=main + '[' 1 -gt 1 ']' + '[' 1 -lt 1 ']' + REPOS=trusty ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.20.0+0~20190716175216.345~1.gbp31b905 + '[' -n 0.20.0+0~20190716175216.345~1.gbp31b905 ']' + echo '*** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 ***' *** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 *** + '[' -z '' ']' + echo '*** Repository variable DEFAULT_REPOSITORY is unset, using default [] ***' *** Repository variable DEFAULT_REPOSITORY is unset, using default [] *** + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio51 ']' + mkdir -p /srv/repository/kamailio51/conf ++ id -un + chown jenkins /srv/repository/kamailio51/conf + touch /srv/repository/kamailio51/conf/distributions + '[' -z 508EA4C8 ']' ++ id -un + flock --timeout 5 9 + grep -q '^$Codename\|Suite$: trusty$' /srv/repository/kamailio51/conf/distributions + echo 'Codename/repository trusty exists already, ignoring request to add again.' Codename/repository trusty exists already, ignoring request to add again. + exit 0 ++ id -un + rm -f /var/lock/jdg-generate-reprepro-codename.jenkins + set -u + umask 022 + PATH=/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin + export QEMU_RESERVED_VA=0x0 + QEMU_RESERVED_VA=0x0 + export TERM=dumb + TERM=dumb ++ date + echo '*** Starting /usr/bin/build-and-provide-package at Fri Nov 8 03:43:42 UTC 2019 ***' *** Starting /usr/bin/build-and-provide-package at Fri Nov 8 03:43:42 UTC 2019 *** ++ sed -e 's/^$[0-9]*$.*/\1/' + start_seconds=9792231 ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.20.0+0~20190716175216.345~1.gbp31b905 + '[' -n 0.20.0+0~20190716175216.345~1.gbp31b905 ']' + echo '*** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 ***' *** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 *** ++ dpkg --print-architecture + HOST_ARCH=amd64 + '[' -n amd64 ']' + echo '*** Identified host architecture amd64 ***' *** Identified host architecture amd64 *** + trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM + checks_and_defaults + '[' -z /srv/repository/kamailio51 ']' + local repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio51 ']' + false + '[' -n '' ']' + '[' -z kamailio51-repos/architecture=i386,distribution=trusty,label=master ']' + '[' -z i386 ']' + set_debootstrap + '[' -n '' ']' + '[' i386 = amd64 ']' + '[' i386 = all ']' + case "$HOST_ARCH" in + '[' i386 = i386 ']' + DEBOOTSTRAP=debootstrap + return 0 + '[' -z '' ']' + REPREPRO_OPTS='-v --waitforlock 1000' + echo '*** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 ***' *** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 *** + REPREPRO_CMD=reprepro + '[' -z '' ']' + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio51 ']' + '[' -z '' ']' + PBUILDER_HOOKDIR=/usr/share/jenkins-debian-glue/pbuilder-hookdir/ + '[' -z '' ']' + '[' -z '' ']' + FREIGHT_VARLIB=/var/lib/freight + FREIGHT_VARCACHE=/var/cache/freight + FREIGHT_CONF=/etc/freight.conf + '[' '' = true ']' + clean_workspace ++ pwd + echo '*** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…]>: ***' *** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…]>: *** + ls -la ./ total 12 drwxr-xr-x 3 jenkins jenkins 4096 Nov 8 03:43 . drwxr-xr-x 3 jenkins jenkins 4096 Nov 8 03:43 .. drwxr-xr-x 2 jenkins jenkins 4096 Nov 8 03:43 binaries + identify_package_name + PACKAGE=kamailio51 + PACKAGE=kamailio51 + '[' -n kamailio51 ']' + echo '*** Identified Debian package name kamailio51 ***' *** Identified Debian package name kamailio51 *** + set_base_path + '[' -n binaries/ ']' + echo '*** Using provided binaries/ as BASE_PATH ***' *** Using provided binaries/ as BASE_PATH *** + build_info + '[' -n trusty ']' + echo '*** Using supplied repository name trusty ***' *** Using supplied repository name trusty *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' binaries//kamailio_5.1.9+trusty.dsc + SOURCE_PACKAGE=kamailio ++ basename binaries//kamailio_5.1.9+trusty.dsc .dsc + p=kamailio_5.1.9+trusty + '[' kamailio_5.1.9+trusty = '*' ']' + cur_version=5.1.9+trusty + '[' -z '' ']' + newest_version=5.1.9+trusty + echo '*** Found package version 5.1.9+trusty ***' *** Found package version 5.1.9+trusty *** + sourcefile='binaries//kamailio_*5.1.9+trusty.dsc' + echo '*** Using binaries//kamailio_*5.1.9+trusty.dsc (version: 5.1.9+trusty)' *** Using binaries//kamailio_*5.1.9+trusty.dsc (version: 5.1.9+trusty) + dist_and_arch_settings + '[' -z i386 ']' + '[' i386 = all ']' + arch=i386 + echo '*** architecture is set to i386 ***' *** architecture is set to i386 *** + '[' -n trusty ']' + local DIST=trusty + '[' -n '' ']' + echo '*** Using cowbuilder base for distribution trusty ***' *** Using cowbuilder base for distribution trusty *** + COWBUILDER_DIST=trusty + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-trusty-i386.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-trusty-i386.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-trusty-i386.cow as cowbuilder base.cow *** + local lockfiles=/var/run/lock/trusty-i386 + build_lockfile=/var/run/lock/trusty-i386.building.15560 + update_lockfile=/var/run/lock/trusty-i386.update + update_lockfile_pid=/var/run/lock/trusty-i386.update.15560 + '[' -n true ']' + echo '*** Config variable '\''PROVIDE_ONLY'\'' is set, ignoring request to run cowbuilder. ***' *** Config variable 'PROVIDE_ONLY' is set, ignoring request to run cowbuilder. *** + '[' -n '' ']' + deploy_to_releases + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + reprepro_wrapper + '[' -n '' ']' + '[' -d /srv/repository/kamailio51 ']' + '[' -r /srv/repository/kamailio51/conf/distributions ']' + grep -q '^$Codename\|Suite$: trusty$' /srv/repository/kamailio51/conf/distributions + remove_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_REMOVAL *** + return 0 + remove_missing_binary_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL *** + return 0 + echo '*** Including packages in repository trusty ***' *** Including packages in repository trusty *** ++ get_arch_changes ++ case ${architecture} in ++ echo i386 + reprepro -b /srv/repository/kamailio51 -v --waitforlock 1000 --ignore=wrongdistribution --ignore=uploaders --ignore=surprisingbinary include trusty <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> .changes put in a distribution not listed within it! Ignoring as --ignore=wrongdistribution given. File "pool/main/k/kamailio/kamailio-nth_5.1.9+trusty_i386.deb" is already registered with different checksums! md5 expected: 33f34cf5271e7ba51ac5a8cebda19aad, got: 05c1e9cd1021bf2d0397030a3ec5d1f9 sha1 expected: fb01ef8a5bb44cc01e4c556a02c4ce13226e835c, got: 3ee7aee47ba7b5ce1e55dd92f3bc577bdd3eb55e sha256 expected: 617035b70e5430c0ff2028bd372923ff0ac4bd57453bca95c01736a8be453195, got: 4f5283503461a36242415df9b5e69cf281554e60463f73004209699ff7202cd5 size expected: 225670, got: 225674 There have been errors! + '[' 254 -eq 0 ']' + bailout 1 'Error: Failed to include binary package in trusty repository.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to include binary package in trusty repository.' ']' + echo 'Error: Failed to include binary package in trusty repository.' Error: Failed to include binary package in trusty repository. + rm -f /var/run/lock/trusty-i386.building.15560 + '[' -r /var/run/lock/trusty-i386.update.15560 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> to avoid problems in next run. *** + rm -f <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=i386,distrib…> + '[' -n '' ']' + '[' -n '' ']' + '[' -n 9792231 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=0 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Fri Nov 8 03:43:42 UTC 2019 [running 0 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Fri Nov 8 03:43:42 UTC 2019 [running 0 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts

1 1

Build failed in Jenkins: kamailio51-repos » amd64,wheezy,master #12
by kamailio＠sipwise.com 12 Feb '20

12 Feb '20

See <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> Changes: ------------------------------------------ Started by upstream project "kamailio51-repos" build number 12 originally caused by: Started by upstream project "kamailio51-binaries" build number 12 originally caused by: Started by upstream project "kamailio51-source" build number 13 originally caused by: Started by an SCM change Running as SYSTEM Building on master in workspace <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> [master] $ /bin/sh -xe /tmp/jenkins8002071353233634496.sh + echo * Removing files workspace before copying artifacts from another project. * * Removing files workspace before copying artifacts from another project. * + rm -f ./* Copied 41 artifacts from "kamailio51-binaries » amd64,wheezy,slave" build number 12 [master] $ /bin/sh -xe /tmp/jenkins7203357714710129009.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-repository + set -e + '[' -z /srv/repository/kamailio51 ']' + repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + echo '*** Sourcing /etc/jenkins/debian_glue ***' *** Sourcing /etc/jenkins/debian_glue *** + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio51 ']' + false + '[' '' = true ']' + ARCHITECTURES='amd64 i386 source' + COMPONENTS=main + UDEB_COMPONENTS=main + '[' 1 -gt 1 ']' + '[' 1 -lt 1 ']' + REPOS=wheezy ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.20.0+0~20190716175216.345~1.gbp31b905 + '[' -n 0.20.0+0~20190716175216.345~1.gbp31b905 ']' + echo '*** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 ***' *** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 *** + '[' -z '' ']' + echo '*** Repository variable DEFAULT_REPOSITORY is unset, using default [] ***' *** Repository variable DEFAULT_REPOSITORY is unset, using default [] *** + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio51 ']' + mkdir -p /srv/repository/kamailio51/conf ++ id -un + chown jenkins /srv/repository/kamailio51/conf + touch /srv/repository/kamailio51/conf/distributions + '[' -z 508EA4C8 ']' ++ id -un + flock --timeout 5 9 + grep -q '^$Codename\|Suite$: wheezy$' /srv/repository/kamailio51/conf/distributions + echo 'Codename/repository wheezy exists already, ignoring request to add again.' Codename/repository wheezy exists already, ignoring request to add again. + exit 0 ++ id -un + rm -f /var/lock/jdg-generate-reprepro-codename.jenkins + set -u + umask 022 + PATH=/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin + export QEMU_RESERVED_VA=0x0 + QEMU_RESERVED_VA=0x0 + export TERM=dumb + TERM=dumb ++ date + echo '*** Starting /usr/bin/build-and-provide-package at Fri Nov 8 03:43:25 UTC 2019 ***' *** Starting /usr/bin/build-and-provide-package at Fri Nov 8 03:43:25 UTC 2019 *** ++ sed -e 's/^$[0-9]*$.*/\1/' + start_seconds=9792214 ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.20.0+0~20190716175216.345~1.gbp31b905 + '[' -n 0.20.0+0~20190716175216.345~1.gbp31b905 ']' + echo '*** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 ***' *** Running jenkins-debian-glue version 0.20.0+0~20190716175216.345~1.gbp31b905 *** ++ dpkg --print-architecture + HOST_ARCH=amd64 + '[' -n amd64 ']' + echo '*** Identified host architecture amd64 ***' *** Identified host architecture amd64 *** + trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM + checks_and_defaults + '[' -z /srv/repository/kamailio51 ']' + local repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio51 ']' + false + '[' -n '' ']' + '[' -z kamailio51-repos/architecture=amd64,distribution=wheezy,label=master ']' + '[' -z amd64 ']' + set_debootstrap + '[' -n '' ']' + '[' amd64 = amd64 ']' + DEBOOTSTRAP=debootstrap + return 0 + '[' -z '' ']' + REPREPRO_OPTS='-v --waitforlock 1000' + echo '*** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 ***' *** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 *** + REPREPRO_CMD=reprepro + '[' -z '' ']' + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio51 ']' + '[' -z '' ']' + PBUILDER_HOOKDIR=/usr/share/jenkins-debian-glue/pbuilder-hookdir/ + '[' -z '' ']' + '[' -z '' ']' + FREIGHT_VARLIB=/var/lib/freight + FREIGHT_VARCACHE=/var/cache/freight + FREIGHT_CONF=/etc/freight.conf + '[' '' = true ']' + clean_workspace ++ pwd + echo '*** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…]>: ***' *** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…]>: *** + ls -la ./ total 12 drwxr-xr-x 3 jenkins jenkins 4096 Nov 8 03:43 . drwxr-xr-x 3 jenkins jenkins 4096 Nov 8 03:43 .. drwxr-xr-x 2 jenkins jenkins 4096 Nov 8 03:43 binaries + identify_package_name + PACKAGE=kamailio51 + PACKAGE=kamailio51 + '[' -n kamailio51 ']' + echo '*** Identified Debian package name kamailio51 ***' *** Identified Debian package name kamailio51 *** + set_base_path + '[' -n binaries/ ']' + echo '*** Using provided binaries/ as BASE_PATH ***' *** Using provided binaries/ as BASE_PATH *** + build_info + '[' -n wheezy ']' + echo '*** Using supplied repository name wheezy ***' *** Using supplied repository name wheezy *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' binaries//kamailio_5.1.9+wheezy.dsc + SOURCE_PACKAGE=kamailio ++ basename binaries//kamailio_5.1.9+wheezy.dsc .dsc + p=kamailio_5.1.9+wheezy + '[' kamailio_5.1.9+wheezy = '*' ']' + cur_version=5.1.9+wheezy + '[' -z '' ']' + newest_version=5.1.9+wheezy + echo '*** Found package version 5.1.9+wheezy ***' *** Found package version 5.1.9+wheezy *** + sourcefile='binaries//kamailio_*5.1.9+wheezy.dsc' + echo '*** Using binaries//kamailio_*5.1.9+wheezy.dsc (version: 5.1.9+wheezy)' *** Using binaries//kamailio_*5.1.9+wheezy.dsc (version: 5.1.9+wheezy) + dist_and_arch_settings + '[' -z amd64 ']' + '[' amd64 = all ']' + arch=amd64 + echo '*** architecture is set to amd64 ***' *** architecture is set to amd64 *** + '[' -n wheezy ']' + local DIST=wheezy + '[' -n '' ']' + echo '*** Using cowbuilder base for distribution wheezy ***' *** Using cowbuilder base for distribution wheezy *** + COWBUILDER_DIST=wheezy + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-wheezy-amd64.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-wheezy-amd64.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-wheezy-amd64.cow as cowbuilder base.cow *** + local lockfiles=/var/run/lock/wheezy-amd64 + build_lockfile=/var/run/lock/wheezy-amd64.building.15000 + update_lockfile=/var/run/lock/wheezy-amd64.update + update_lockfile_pid=/var/run/lock/wheezy-amd64.update.15000 + '[' -n true ']' + echo '*** Config variable '\''PROVIDE_ONLY'\'' is set, ignoring request to run cowbuilder. ***' *** Config variable 'PROVIDE_ONLY' is set, ignoring request to run cowbuilder. *** + '[' -n '' ']' + deploy_to_releases + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + reprepro_wrapper + '[' -n '' ']' + '[' -d /srv/repository/kamailio51 ']' + '[' -r /srv/repository/kamailio51/conf/distributions ']' + grep -q '^$Codename\|Suite$: wheezy$' /srv/repository/kamailio51/conf/distributions + remove_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_REMOVAL *** + return 0 + remove_missing_binary_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL *** + return 0 + echo '*** Including packages in repository wheezy ***' *** Including packages in repository wheezy *** ++ get_arch_changes ++ case ${architecture} in ++ echo amd64 + reprepro -b /srv/repository/kamailio51 -v --waitforlock 1000 --ignore=wrongdistribution --ignore=uploaders --ignore=surprisingbinary include wheezy <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> .changes put in a distribution not listed within it! Ignoring as --ignore=wrongdistribution given. File "pool/main/k/kamailio/kamailio-nth_5.1.9+wheezy_amd64.deb" is already registered with different checksums! md5 expected: 8e0a652ba6c957261f3d4100538d8c69, got: 5c9cd6ee6c1783ce10fd1484fc2542d1 sha1 expected: f82ff310df793c0f85310e24b43fa57ca85564c8, got: a0759ef8b848433c256d9ede64027d7a791141f9 sha256 expected: f5195965a9d2d9736fecdb9afff5cc0634265948ee3a62ddf9a5c82bb08a07c5, got: a4c57fe65cc6c939e5ef6b477c8e924cb820ca3898a28cc5c866ba219b970642 size expected: 225524, got: 225540 There have been errors! + '[' 254 -eq 0 ']' + bailout 1 'Error: Failed to include binary package in wheezy repository.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to include binary package in wheezy repository.' ']' + echo 'Error: Failed to include binary package in wheezy repository.' Error: Failed to include binary package in wheezy repository. + rm -f /var/run/lock/wheezy-amd64.building.15000 + '[' -r /var/run/lock/wheezy-amd64.update.15000 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> to avoid problems in next run. *** + rm -f <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio51-repos/architecture=amd64,distri…> + '[' -n '' ']' + '[' -n '' ']' + '[' -n 9792214 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=0 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Fri Nov 8 03:43:25 UTC 2019 [running 0 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Fri Nov 8 03:43:25 UTC 2019 [running 0 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev