- sr-dev - kamailio.org

git:5.1:bf023ac2: db_berkeley: removed inline declaration that break the linking
by Daniel-Constantin Mierla 10 Dec '17

10 Dec '17

Module: kamailio Branch: 5.1 Commit: bf023ac2e04010f647147e9c68324d2337554464 URL: https://github.com/kamailio/kamailio/commit/bf023ac2e04010f647147e9c68324d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-10T09:36:42+01:00 db_berkeley: removed inline declaration that break the linking (cherry picked from commit 373e99fd593814b55b307d0dc4a29e0c53f34850) --- Modified: src/modules/db_berkeley/bdb_lib.c Modified: src/modules/db_berkeley/km_bdb_val.c --- Diff: https://github.com/kamailio/kamailio/commit/bf023ac2e04010f647147e9c68324d2… Patch: https://github.com/kamailio/kamailio/commit/bf023ac2e04010f647147e9c68324d2… --- diff --git a/src/modules/db_berkeley/bdb_lib.c b/src/modules/db_berkeley/bdb_lib.c index bded92e764..4b109dde3b 100644 --- a/src/modules/db_berkeley/bdb_lib.c +++ b/src/modules/db_berkeley/bdb_lib.c @@ -972,7 +972,7 @@ int load_metadata_defaults(bdb_table_p _tp) return 0; } -inline int bdb_int2str(int _v, char* _s, int* _l) +int bdb_int2str(int _v, char* _s, int* _l) { int ret; @@ -991,7 +991,7 @@ inline int bdb_int2str(int _v, char* _s, int* _l) return 0; } -inline int bdb_double2str(double _v, char* _s, int* _l) +int bdb_double2str(double _v, char* _s, int* _l) { int ret; @@ -1010,7 +1010,7 @@ inline int bdb_double2str(double _v, char* _s, int* _l) return 0; } -inline int bdb_time2str(time_t _v, char* _s, int* _l) +int bdb_time2str(time_t _v, char* _s, int* _l) { struct tm* t; int l; diff --git a/src/modules/db_berkeley/km_bdb_val.c b/src/modules/db_berkeley/km_bdb_val.c index 6689be7cdb..c5bbfe8d9d 100644 --- a/src/modules/db_berkeley/km_bdb_val.c +++ b/src/modules/db_berkeley/km_bdb_val.c @@ -48,7 +48,7 @@ * should be done in the val2str function, as some databases * like db_berkeley don't need or like this at all. */ -inline int km_bdb_time2str(time_t _v, char* _s, int* _l) +int km_bdb_time2str(time_t _v, char* _s, int* _l) { struct tm* t; int l;

1 0

git:5.1:a2a0d0a9: pkg/deb: ubuntu xenial has a dedicated package for libgeocoding
by Daniel-Constantin Mierla 10 Dec '17

10 Dec '17

Module: kamailio Branch: 5.1 Commit: a2a0d0a9b3a744c28e9e319b52287e8073649849 URL: https://github.com/kamailio/kamailio/commit/a2a0d0a9b3a744c28e9e319b52287e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-10T09:36:52+01:00 pkg/deb: ubuntu xenial has a dedicated package for libgeocoding - other debian varians have it inside libphonenumber (cherry picked from commit 9063113be66678103f509d98f24a74fa211b9a68) --- Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/a2a0d0a9b3a744c28e9e319b52287e8… Patch: https://github.com/kamailio/kamailio/commit/a2a0d0a9b3a744c28e9e319b52287e8… --- diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index 7c6c39f748..6bd695724f 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -21,6 +21,7 @@ Build-Depends: libev-dev, libevent-dev, libexpat1-dev, + libgeocoding-dev (>= 7), libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjansson-dev,

1 0

git:master:9063113b: pkg/deb: ubuntu xenial has a dedicated package for libgeocoding
by Daniel-Constantin Mierla 10 Dec '17

10 Dec '17

Module: kamailio Branch: master Commit: 9063113be66678103f509d98f24a74fa211b9a68 URL: https://github.com/kamailio/kamailio/commit/9063113be66678103f509d98f24a74f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-10T09:35:44+01:00 pkg/deb: ubuntu xenial has a dedicated package for libgeocoding - other debian varians have it inside libphonenumber --- Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/9063113be66678103f509d98f24a74f… Patch: https://github.com/kamailio/kamailio/commit/9063113be66678103f509d98f24a74f… --- diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index 7c6c39f748..6bd695724f 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -21,6 +21,7 @@ Build-Depends: libev-dev, libevent-dev, libexpat1-dev, + libgeocoding-dev (>= 7), libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjansson-dev,

1 0

git:5.1:d8fe6961: ims_charging: remove inline to functions that break the symbol linking
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: d8fe696139c776e10b605e396f4e8c6d7a9e842f URL: https://github.com/kamailio/kamailio/commit/d8fe696139c776e10b605e396f4e8c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:58:34+01:00 ims_charging: remove inline to functions that break the symbol linking (cherry picked from commit 4e03e218cbfa06253d22f85eb21c27a0951ff50e) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/d8fe696139c776e10b605e396f4e8c6… Patch: https://github.com/kamailio/kamailio/commit/d8fe696139c776e10b605e396f4e8c6…

1 0

git:5.1:85a46bdd: ims_usrloc_scscf: remove inline to functions that break the symbol linking
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 85a46bdd92963589f3d3575e8c3c2d33597bae38 URL: https://github.com/kamailio/kamailio/commit/85a46bdd92963589f3d3575e8c3c2d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:58:45+01:00 ims_usrloc_scscf: remove inline to functions that break the symbol linking (cherry picked from commit 5b35d7e372a0c0fb8d0047eb952066939cd98463) --- Modified: src/modules/ims_usrloc_scscf/impurecord.c Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/85a46bdd92963589f3d3575e8c3c2d3… Patch: https://github.com/kamailio/kamailio/commit/85a46bdd92963589f3d3575e8c3c2d3… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 9756424cc2..9cee5bc765 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -606,7 +606,7 @@ int delete_scontact(struct ucontact* _c) { } /* function to convert contact aor to only have data after @ - ie strip user part */ -inline int aor_to_contact(str* aor, str* contact) { +int aor_to_contact(str* aor, str* contact) { char* p; int ret = 0; //success diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index 2a25d90647..e1a7d4287e 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -505,7 +505,7 @@ int db_delete_subscriber(impurecord_t* _r, reg_subscriber* _reg_subscriber) { } -int inline int_to_str_len(int i) { +int int_to_str_len(int i) { if (i < 0) i = -i; if (i < 10)

1 0

git:5.1:5bde5d47: db_perlvdb: remove inline to functions that break the symbol linking
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 5bde5d47e944cd55e1d1476c46b5f24d20ef0838 URL: https://github.com/kamailio/kamailio/commit/5bde5d47e944cd55e1d1476c46b5f24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:58:26+01:00 db_perlvdb: remove inline to functions that break the symbol linking (cherry picked from commit 8dc82f3ac87502dcf149f7b46367bfc3c45f2621) --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/5bde5d47e944cd55e1d1476c46b5f24… Patch: https://github.com/kamailio/kamailio/commit/5bde5d47e944cd55e1d1476c46b5f24… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index 52a145c673..c3f1e6800b 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -92,7 +92,7 @@ AV *keys2perlarray(db_key_t* keys, int n) { return array; } -inline SV *valdata(db_val_t* val) { +SV *valdata(db_val_t* val) { SV *data = &PL_sv_undef; const char* stringval;

1 0

git:5.1:17ad3546: cdp: remove inline to functions that break the symbol linking
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 17ad3546e38dde4c893fd6e3394615e34c88466e URL: https://github.com/kamailio/kamailio/commit/17ad3546e38dde4c893fd6e3394615e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:58:17+01:00 cdp: remove inline to functions that break the symbol linking (cherry picked from commit 76a262f4c39ecb48410f0cb531cf144baf8105e6) --- Modified: src/modules/cdp/diameter_avp.c Modified: src/modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/17ad3546e38dde4c893fd6e3394615e… Patch: https://github.com/kamailio/kamailio/commit/17ad3546e38dde4c893fd6e3394615e… --- diff --git a/src/modules/cdp/diameter_avp.c b/src/modules/cdp/diameter_avp.c index c2f17eca9f..ae66ab3e74 100644 --- a/src/modules/cdp/diameter_avp.c +++ b/src/modules/cdp/diameter_avp.c @@ -60,7 +60,7 @@ * @param avp - the actual AVP to set flags * \note This function is taken from DISC http://developer.berlios.de/projects/disc/ */ -inline void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) +void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) { switch (code) { case 1: /*AVP_User_Name*/ diff --git a/src/modules/cdp/session.c b/src/modules/cdp/session.c index 3a609b369c..dd5c026e3e 100644 --- a/src/modules/cdp/session.c +++ b/src/modules/cdp/session.c @@ -223,7 +223,7 @@ int cdp_sessions_destroy() * @param hash_size - value to % with * @returns the hash % hash_size */ -inline unsigned int get_str_hash(str x,int hash_size) +unsigned int get_str_hash(str x,int hash_size) { #define h_inc h+=v^(v>>3) char* p;

1 0

git:5.1:1052fae5: phonenum: linking with libphonenumbers requires -lgeocoding
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 1052fae5d616bc42e1fda5165e7ccd46c87dbbc7 URL: https://github.com/kamailio/kamailio/commit/1052fae5d616bc42e1fda5165e7ccd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:57:57+01:00 phonenum: linking with libphonenumbers requires -lgeocoding (cherry picked from commit 3e80324168536fbb97a592254725f2aa6ea589af) --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/1052fae5d616bc42e1fda5165e7ccd4… Patch: https://github.com/kamailio/kamailio/commit/1052fae5d616bc42e1fda5165e7ccd4… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index b66f2b8c82..4c905cec36 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -9,7 +9,7 @@ CXX=g++ LD=g++ LIB_DIR = /opt/local/lib -LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber +LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding DEFS+= -I/opt/local/include -DKAMAILIO_MOD_INTERFACE

1 0

git:5.1:4133939a: auth_diameter: init socketfd variable
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 4133939a898d1e1c6d40c5a7292353c4de9819eb URL: https://github.com/kamailio/kamailio/commit/4133939a898d1e1c6d40c5a7292353c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:58:08+01:00 auth_diameter: init socketfd variable - remove inline to functions that break the symbol linking (cherry picked from commit f3a37060232c2a666e9709f4071ced344a44b1e3) --- Modified: src/modules/auth_diameter/auth_diameter.c Modified: src/modules/auth_diameter/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/4133939a898d1e1c6d40c5a7292353c… Patch: https://github.com/kamailio/kamailio/commit/4133939a898d1e1c6d40c5a7292353c… --- diff --git a/src/modules/auth_diameter/auth_diameter.c b/src/modules/auth_diameter/auth_diameter.c index a464ca77de..99d094241a 100644 --- a/src/modules/auth_diameter/auth_diameter.c +++ b/src/modules/auth_diameter/auth_diameter.c @@ -61,6 +61,7 @@ int diameter_is_user_in(struct sip_msg* _msg, char* group, char* _s2); char* diameter_client_host = "localhost"; int diameter_client_port = 3000; int use_domain = 0; +int sockfd = -1; rd_buf_t *rb; diff --git a/src/modules/auth_diameter/avp.c b/src/modules/auth_diameter/avp.c index 2a78df061e..d61a9200dc 100644 --- a/src/modules/auth_diameter/avp.c +++ b/src/modules/auth_diameter/avp.c @@ -37,7 +37,7 @@ * All this default values (for flags and data-type) are correct/set by this * function. */ -inline void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) +void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) { switch (code) { case 1: /*AVP_User_Name*/

1 0

git:5.1:4fcf33ef: misc_radius: fixed name of function exported to cfg
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 4fcf33efe44cf903129623477557778c9be218cf URL: https://github.com/kamailio/kamailio/commit/4fcf33efe44cf903129623477557778… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:57:48+01:00 misc_radius: fixed name of function exported to cfg (cherry picked from commit 9a21a25a831d1ce241785eba92819be71af861ef) --- Modified: src/modules/misc_radius/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/4fcf33efe44cf903129623477557778… Patch: https://github.com/kamailio/kamailio/commit/4fcf33efe44cf903129623477557778… --- diff --git a/src/modules/misc_radius/functions.c b/src/modules/misc_radius/functions.c index 9a6abfbeab..d01e79f658 100644 --- a/src/modules/misc_radius/functions.c +++ b/src/modules/misc_radius/functions.c @@ -664,7 +664,7 @@ int ki_radius_does_uri_exist_uval(struct sip_msg *_m, str *suri) _m, &parsed_uri.user, &parsed_uri.host); } -int radius_does_uri_exist(struct sip_msg *_m, char *_sp, char *_s2) +int radius_does_uri_exist_1(struct sip_msg *_m, char *_sp, char *_s2) { str suri;

1 0

git:5.1:2c640b44: rls: define cfg function with two parameters even one is used
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 2c640b4415bfbf8d733ca8e7913c31d6ad22bc90 URL: https://github.com/kamailio/kamailio/commit/2c640b4415bfbf8d733ca8e7913c31d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:57:28+01:00 rls: define cfg function with two parameters even one is used (cherry picked from commit 03c4439c0bbe40209ded86ca8ddddd496893ecfc) --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/2c640b4415bfbf8d733ca8e7913c31d… Patch: https://github.com/kamailio/kamailio/commit/2c640b4415bfbf8d733ca8e7913c31d… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index 65ef924108..c895bd1a93 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -465,7 +465,7 @@ int ki_rls_handle_subscribe_uri(sip_msg_t* msg, str *wuri) return rls_handle_subscribe(msg, parsed_wuri.user, parsed_wuri.host); } -int w_rls_handle_subscribe(struct sip_msg* msg, char* watcher_uri) +int w_rls_handle_subscribe1(struct sip_msg* msg, char* watcher_uri, char *p2) { str wuri; @@ -1322,4 +1322,4 @@ int w_rls_update_subs(struct sip_msg *msg, char *puri, char *pevent) } return ki_rls_update_subs(msg, &uri, &event); -} \ No newline at end of file +}

1 0

git:5.1:e27ad201: acc_diameter: use acc api to parse extra string
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: e27ad201d430636a4b699054dffea4e4b4dc967a URL: https://github.com/kamailio/kamailio/commit/e27ad201d430636a4b699054dffea4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:57:37+01:00 acc_diameter: use acc api to parse extra string - remove inline to avoid missing symbol in linker (cherry picked from commit fc65848a680006a37b71dbdad21bdc9902eff22f) --- Modified: src/modules/acc_diameter/acc_diameter_mod.c Modified: src/modules/acc_diameter/diam_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/e27ad201d430636a4b699054dffea4e… Patch: https://github.com/kamailio/kamailio/commit/e27ad201d430636a4b699054dffea4e… --- diff --git a/src/modules/acc_diameter/acc_diameter_mod.c b/src/modules/acc_diameter/acc_diameter_mod.c index 7e2b379810..d82e541b0c 100644 --- a/src/modules/acc_diameter/acc_diameter_mod.c +++ b/src/modules/acc_diameter/acc_diameter_mod.c @@ -137,7 +137,7 @@ static int mod_init( void ) /* parse the extra string, if any */ if (diameter_extra_str - && (diameter_extra=parse_acc_extra(diameter_extra_str))==0 ) { + && (diameter_extra=accb.parse_extra(diameter_extra_str))==0 ) { LM_ERR("failed to parse diameter_extra param\n"); return -1; } @@ -191,11 +191,22 @@ static int child_init(int rank) } +static void diam_destroy_extras(acc_extra_t *extra) +{ + acc_extra_t *foo; + + while (extra) { + foo = extra; + extra = extra->next; + pkg_free(foo); + } +} + static void destroy(void) { close_tcp_connection(sockfd); if (diameter_extra) - destroy_extras( diameter_extra); + diam_destroy_extras(diameter_extra); } /************************** FIXUP functions ****************************/ @@ -287,7 +298,7 @@ int acc_diam_init(acc_extra_t *leg_info) } -inline unsigned long diam_status(struct sip_msg *rq, int code) +int diam_status(struct sip_msg *rq, int code) { if ((rq->REQ_METHOD==METHOD_INVITE || rq->REQ_METHOD==METHOD_ACK) && code>=200 && code<300) diff --git a/src/modules/acc_diameter/diam_avp.c b/src/modules/acc_diameter/diam_avp.c index 2ea5a577fa..038f6c8eba 100644 --- a/src/modules/acc_diameter/diam_avp.c +++ b/src/modules/acc_diameter/diam_avp.c @@ -41,7 +41,7 @@ * All this default values (for flags and data-type) are correct/set by this * function. */ -inline void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) +void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) { switch (code) { case 1: /*AVP_User_Name*/

1 0

git:master:5b35d7e3: ims_usrloc_scscf: remove inline to functions that break the symbol linking
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 5b35d7e372a0c0fb8d0047eb952066939cd98463 URL: https://github.com/kamailio/kamailio/commit/5b35d7e372a0c0fb8d0047eb9520669… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 ims_usrloc_scscf: remove inline to functions that break the symbol linking --- Modified: src/modules/ims_usrloc_scscf/impurecord.c Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5b35d7e372a0c0fb8d0047eb9520669… Patch: https://github.com/kamailio/kamailio/commit/5b35d7e372a0c0fb8d0047eb9520669… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 9756424cc2..9cee5bc765 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -606,7 +606,7 @@ int delete_scontact(struct ucontact* _c) { } /* function to convert contact aor to only have data after @ - ie strip user part */ -inline int aor_to_contact(str* aor, str* contact) { +int aor_to_contact(str* aor, str* contact) { char* p; int ret = 0; //success diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index 2a25d90647..e1a7d4287e 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -505,7 +505,7 @@ int db_delete_subscriber(impurecord_t* _r, reg_subscriber* _reg_subscriber) { } -int inline int_to_str_len(int i) { +int int_to_str_len(int i) { if (i < 0) i = -i; if (i < 10)

1 0

git:master:4e03e218: ims_charging: remove inline to functions that break the symbol linking
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 4e03e218cbfa06253d22f85eb21c27a0951ff50e URL: https://github.com/kamailio/kamailio/commit/4e03e218cbfa06253d22f85eb21c27a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 ims_charging: remove inline to functions that break the symbol linking --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/4e03e218cbfa06253d22f85eb21c27a… Patch: https://github.com/kamailio/kamailio/commit/4e03e218cbfa06253d22f85eb21c27a…

1 0

git:master:8dc82f3a: db_perlvdb: remove inline to functions that break the symbol linking
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 8dc82f3ac87502dcf149f7b46367bfc3c45f2621 URL: https://github.com/kamailio/kamailio/commit/8dc82f3ac87502dcf149f7b46367bfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 db_perlvdb: remove inline to functions that break the symbol linking --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/8dc82f3ac87502dcf149f7b46367bfc… Patch: https://github.com/kamailio/kamailio/commit/8dc82f3ac87502dcf149f7b46367bfc… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index 52a145c673..c3f1e6800b 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -92,7 +92,7 @@ AV *keys2perlarray(db_key_t* keys, int n) { return array; } -inline SV *valdata(db_val_t* val) { +SV *valdata(db_val_t* val) { SV *data = &PL_sv_undef; const char* stringval;

1 0

git:master:f3a37060: auth_diameter: init socketfd variable
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: f3a37060232c2a666e9709f4071ced344a44b1e3 URL: https://github.com/kamailio/kamailio/commit/f3a37060232c2a666e9709f4071ced3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 auth_diameter: init socketfd variable - remove inline to functions that break the symbol linking --- Modified: src/modules/auth_diameter/auth_diameter.c Modified: src/modules/auth_diameter/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/f3a37060232c2a666e9709f4071ced3… Patch: https://github.com/kamailio/kamailio/commit/f3a37060232c2a666e9709f4071ced3… --- diff --git a/src/modules/auth_diameter/auth_diameter.c b/src/modules/auth_diameter/auth_diameter.c index a464ca77de..99d094241a 100644 --- a/src/modules/auth_diameter/auth_diameter.c +++ b/src/modules/auth_diameter/auth_diameter.c @@ -61,6 +61,7 @@ int diameter_is_user_in(struct sip_msg* _msg, char* group, char* _s2); char* diameter_client_host = "localhost"; int diameter_client_port = 3000; int use_domain = 0; +int sockfd = -1; rd_buf_t *rb; diff --git a/src/modules/auth_diameter/avp.c b/src/modules/auth_diameter/avp.c index 2a78df061e..d61a9200dc 100644 --- a/src/modules/auth_diameter/avp.c +++ b/src/modules/auth_diameter/avp.c @@ -37,7 +37,7 @@ * All this default values (for flags and data-type) are correct/set by this * function. */ -inline void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) +void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) { switch (code) { case 1: /*AVP_User_Name*/

1 0

git:master:76a262f4: cdp: remove inline to functions that break the symbol linking
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 76a262f4c39ecb48410f0cb531cf144baf8105e6 URL: https://github.com/kamailio/kamailio/commit/76a262f4c39ecb48410f0cb531cf144… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 cdp: remove inline to functions that break the symbol linking --- Modified: src/modules/cdp/diameter_avp.c Modified: src/modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/76a262f4c39ecb48410f0cb531cf144… Patch: https://github.com/kamailio/kamailio/commit/76a262f4c39ecb48410f0cb531cf144… --- diff --git a/src/modules/cdp/diameter_avp.c b/src/modules/cdp/diameter_avp.c index c2f17eca9f..ae66ab3e74 100644 --- a/src/modules/cdp/diameter_avp.c +++ b/src/modules/cdp/diameter_avp.c @@ -60,7 +60,7 @@ * @param avp - the actual AVP to set flags * \note This function is taken from DISC http://developer.berlios.de/projects/disc/ */ -inline void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) +void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) { switch (code) { case 1: /*AVP_User_Name*/ diff --git a/src/modules/cdp/session.c b/src/modules/cdp/session.c index 3a609b369c..dd5c026e3e 100644 --- a/src/modules/cdp/session.c +++ b/src/modules/cdp/session.c @@ -223,7 +223,7 @@ int cdp_sessions_destroy() * @param hash_size - value to % with * @returns the hash % hash_size */ -inline unsigned int get_str_hash(str x,int hash_size) +unsigned int get_str_hash(str x,int hash_size) { #define h_inc h+=v^(v>>3) char* p;

1 0

git:master:3e803241: phonenum: linking with libphonenumbers requires -lgeocoding
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 3e80324168536fbb97a592254725f2aa6ea589af URL: https://github.com/kamailio/kamailio/commit/3e80324168536fbb97a592254725f2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 phonenum: linking with libphonenumbers requires -lgeocoding --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3e80324168536fbb97a592254725f2a… Patch: https://github.com/kamailio/kamailio/commit/3e80324168536fbb97a592254725f2a… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index b66f2b8c82..4c905cec36 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -9,7 +9,7 @@ CXX=g++ LD=g++ LIB_DIR = /opt/local/lib -LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber +LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding DEFS+= -I/opt/local/include -DKAMAILIO_MOD_INTERFACE

1 0

git:master:9a21a25a: misc_radius: fixed name of function exported to cfg
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 9a21a25a831d1ce241785eba92819be71af861ef URL: https://github.com/kamailio/kamailio/commit/9a21a25a831d1ce241785eba92819be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 misc_radius: fixed name of function exported to cfg --- Modified: src/modules/misc_radius/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/9a21a25a831d1ce241785eba92819be… Patch: https://github.com/kamailio/kamailio/commit/9a21a25a831d1ce241785eba92819be… --- diff --git a/src/modules/misc_radius/functions.c b/src/modules/misc_radius/functions.c index 9a6abfbeab..d01e79f658 100644 --- a/src/modules/misc_radius/functions.c +++ b/src/modules/misc_radius/functions.c @@ -664,7 +664,7 @@ int ki_radius_does_uri_exist_uval(struct sip_msg *_m, str *suri) _m, &parsed_uri.user, &parsed_uri.host); } -int radius_does_uri_exist(struct sip_msg *_m, char *_sp, char *_s2) +int radius_does_uri_exist_1(struct sip_msg *_m, char *_sp, char *_s2) { str suri;

1 0

git:master:03c4439c: rls: define cfg function with two parameters even one is used
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 03c4439c0bbe40209ded86ca8ddddd496893ecfc URL: https://github.com/kamailio/kamailio/commit/03c4439c0bbe40209ded86ca8ddddd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 rls: define cfg function with two parameters even one is used --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/03c4439c0bbe40209ded86ca8ddddd4… Patch: https://github.com/kamailio/kamailio/commit/03c4439c0bbe40209ded86ca8ddddd4… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index 65ef924108..c895bd1a93 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -465,7 +465,7 @@ int ki_rls_handle_subscribe_uri(sip_msg_t* msg, str *wuri) return rls_handle_subscribe(msg, parsed_wuri.user, parsed_wuri.host); } -int w_rls_handle_subscribe(struct sip_msg* msg, char* watcher_uri) +int w_rls_handle_subscribe1(struct sip_msg* msg, char* watcher_uri, char *p2) { str wuri; @@ -1322,4 +1322,4 @@ int w_rls_update_subs(struct sip_msg *msg, char *puri, char *pevent) } return ki_rls_update_subs(msg, &uri, &event); -} \ No newline at end of file +}

1 0

git:master:fc65848a: acc_diameter: use acc api to parse extra string
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: fc65848a680006a37b71dbdad21bdc9902eff22f URL: https://github.com/kamailio/kamailio/commit/fc65848a680006a37b71dbdad21bdc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T13:50:34+01:00 acc_diameter: use acc api to parse extra string - remove inline to avoid missing symbol in linker --- Modified: src/modules/acc_diameter/acc_diameter_mod.c Modified: src/modules/acc_diameter/diam_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/fc65848a680006a37b71dbdad21bdc9… Patch: https://github.com/kamailio/kamailio/commit/fc65848a680006a37b71dbdad21bdc9… --- diff --git a/src/modules/acc_diameter/acc_diameter_mod.c b/src/modules/acc_diameter/acc_diameter_mod.c index 7e2b379810..d82e541b0c 100644 --- a/src/modules/acc_diameter/acc_diameter_mod.c +++ b/src/modules/acc_diameter/acc_diameter_mod.c @@ -137,7 +137,7 @@ static int mod_init( void ) /* parse the extra string, if any */ if (diameter_extra_str - && (diameter_extra=parse_acc_extra(diameter_extra_str))==0 ) { + && (diameter_extra=accb.parse_extra(diameter_extra_str))==0 ) { LM_ERR("failed to parse diameter_extra param\n"); return -1; } @@ -191,11 +191,22 @@ static int child_init(int rank) } +static void diam_destroy_extras(acc_extra_t *extra) +{ + acc_extra_t *foo; + + while (extra) { + foo = extra; + extra = extra->next; + pkg_free(foo); + } +} + static void destroy(void) { close_tcp_connection(sockfd); if (diameter_extra) - destroy_extras( diameter_extra); + diam_destroy_extras(diameter_extra); } /************************** FIXUP functions ****************************/ @@ -287,7 +298,7 @@ int acc_diam_init(acc_extra_t *leg_info) } -inline unsigned long diam_status(struct sip_msg *rq, int code) +int diam_status(struct sip_msg *rq, int code) { if ((rq->REQ_METHOD==METHOD_INVITE || rq->REQ_METHOD==METHOD_ACK) && code>=200 && code<300) diff --git a/src/modules/acc_diameter/diam_avp.c b/src/modules/acc_diameter/diam_avp.c index 2ea5a577fa..038f6c8eba 100644 --- a/src/modules/acc_diameter/diam_avp.c +++ b/src/modules/acc_diameter/diam_avp.c @@ -41,7 +41,7 @@ * All this default values (for flags and data-type) are correct/set by this * function. */ -inline void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) +void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) { switch (code) { case 1: /*AVP_User_Name*/

1 0

git:5.1:b60b639a: presence: update record_route in database
by Luis Azedo 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: b60b639a31d26d02aabea22d55b40773a23d5a4b URL: https://github.com/kamailio/kamailio/commit/b60b639a31d26d02aabea22d55b4077… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-12-09T11:37:39Z presence: update record_route in database (cherry picked from commit e52547956462ad53032be95ff5f2701785dfdd2a) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/b60b639a31d26d02aabea22d55b4077… Patch: https://github.com/kamailio/kamailio/commit/b60b639a31d26d02aabea22d55b4077… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 3ba9cc4c15..36329ab198 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -427,6 +427,12 @@ int update_subs_db(subs_t* subs, int type) update_vals[n_update_cols].val.str_val = subs->contact; n_update_cols++; + update_keys[n_update_cols] = &str_record_route_col; + update_vals[n_update_cols].type = DB1_STR; + update_vals[n_update_cols].nul = 0; + update_vals[n_update_cols].val.str_val = subs->record_route; + n_update_cols++; + } if(type & LOCAL_TYPE) {

1 0

git:5.0:cd0593e3: presence: update record_route in database
by Luis Azedo 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.0 Commit: cd0593e3feab0f1a55819928c1a4b68df5abaf35 URL: https://github.com/kamailio/kamailio/commit/cd0593e3feab0f1a55819928c1a4b68… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-12-09T11:36:28Z presence: update record_route in database (cherry picked from commit e52547956462ad53032be95ff5f2701785dfdd2a) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/cd0593e3feab0f1a55819928c1a4b68… Patch: https://github.com/kamailio/kamailio/commit/cd0593e3feab0f1a55819928c1a4b68… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 4f902e7403..18bb2b1a70 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -427,6 +427,12 @@ int update_subs_db(subs_t* subs, int type) update_vals[n_update_cols].val.str_val = subs->contact; n_update_cols++; + update_keys[n_update_cols] = &str_record_route_col; + update_vals[n_update_cols].type = DB1_STR; + update_vals[n_update_cols].nul = 0; + update_vals[n_update_cols].val.str_val = subs->record_route; + n_update_cols++; + } if(type & LOCAL_TYPE) {

1 0

git:5.0:3a7f60ee: presence: increased the size of db update arrays in update_subs_db()
by Luis Azedo 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.0 Commit: 3a7f60ee237e29919586400f7700f4393b9083f2 URL: https://github.com/kamailio/kamailio/commit/3a7f60ee237e29919586400f7700f43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-12-09T11:35:56Z presence: increased the size of db update arrays in update_subs_db() (cherry picked from commit 816d2cd44d96245b5a5b53505d6fbc350bda378c) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/3a7f60ee237e29919586400f7700f43… Patch: https://github.com/kamailio/kamailio/commit/3a7f60ee237e29919586400f7700f43… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 6c21e75bd0..4f902e7403 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -372,8 +372,8 @@ int insert_subs_db(subs_t* s, int type) int update_subs_db(subs_t* subs, int type) { - db_key_t query_cols[3], update_keys[8]; - db_val_t query_vals[3], update_vals[8]; + db_key_t query_cols[3], update_keys[10]; + db_val_t query_vals[3], update_vals[10]; int n_update_cols= 0; int n_query_cols = 0;

1 0

git:master:e5254795: presence: update record_route in database
by lazedo 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: e52547956462ad53032be95ff5f2701785dfdd2a URL: https://github.com/kamailio/kamailio/commit/e52547956462ad53032be95ff5f2701… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-12-09T11:34:13Z presence: update record_route in database --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/e52547956462ad53032be95ff5f2701… Patch: https://github.com/kamailio/kamailio/commit/e52547956462ad53032be95ff5f2701… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 3ba9cc4c15..36329ab198 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -427,6 +427,12 @@ int update_subs_db(subs_t* subs, int type) update_vals[n_update_cols].val.str_val = subs->contact; n_update_cols++; + update_keys[n_update_cols] = &str_record_route_col; + update_vals[n_update_cols].type = DB1_STR; + update_vals[n_update_cols].nul = 0; + update_vals[n_update_cols].val.str_val = subs->record_route; + n_update_cols++; + } if(type & LOCAL_TYPE) {

1 0

[kamailio/kamailio] presence: update record_route in database (#1357)
by lazedo 09 Dec '17

09 Dec '17

missed update from 49272f23b22445415721766709bf5841865e8609 should be backported with 816d2cd44d96245b5a5b53505d6fbc350bda378c You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1357 -- Commit Summary -- * presence: update record_route in database -- File Changes -- M src/modules/presence/subscribe.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1357.patch https://github.com/kamailio/kamailio/pull/1357.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/1357

2 2

git:5.1:98528af1: kamctl: regenerated scripts to create database structure for presence
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 98528af1b87526395339aa3ed2d176b77b897740 URL: https://github.com/kamailio/kamailio/commit/98528af1b87526395339aa3ed2d176b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T09:23:38+01:00 kamctl: regenerated scripts to create database structure for presence --- Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/dbtext/kamailio/active_watchers Modified: utils/kamctl/mongodb/kamailio/active_watchers.json Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/98528af1b87526395339aa3ed2d176b… Patch: https://github.com/kamailio/kamailio/commit/98528af1b87526395339aa3ed2d176b… --- diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index a84ee99965..c4d01296a7 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -35,7 +35,7 @@ CREATE TABLE active_watchers ( record_route TEXT, expires INTEGER NOT NULL, status INTEGER DEFAULT 2 NOT NULL, - reason VARCHAR(64) NOT NULL, + reason VARCHAR(64), version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/active_watchers b/utils/kamctl/dbtext/kamailio/active_watchers index b4053a323e..19719b72d5 100644 --- a/utils/kamctl/dbtext/kamailio/active_watchers +++ b/utils/kamctl/dbtext/kamailio/active_watchers @@ -1 +1 @@ -id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string) +id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string,null) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string) diff --git a/utils/kamctl/mongodb/kamailio/active_watchers.json b/utils/kamctl/mongodb/kamailio/active_watchers.json index adc1d27d0d..123692d988 100644 --- a/utils/kamctl/mongodb/kamailio/active_watchers.json +++ b/utils/kamctl/mongodb/kamailio/active_watchers.json @@ -90,7 +90,7 @@ "reason": { "type": "string", "default": null, - "null": false + "null": true }, "version": { "type": "int", diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index c4423b508e..95d85cdc19 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -35,7 +35,7 @@ CREATE TABLE `active_watchers` ( `record_route` TEXT, `expires` INT(11) NOT NULL, `status` INT(11) DEFAULT 2 NOT NULL, - `reason` VARCHAR(64) NOT NULL, + `reason` VARCHAR(64), `version` INT(11) DEFAULT 0 NOT NULL, `socket_info` VARCHAR(64) NOT NULL, `local_contact` VARCHAR(128) NOT NULL, diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index aa0efc8034..698352ca16 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -35,7 +35,7 @@ CREATE TABLE active_watchers ( record_route TEXT, expires INTEGER NOT NULL, status INTEGER DEFAULT 2 NOT NULL, - reason VARCHAR(64) NOT NULL, + reason VARCHAR(64), version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL,

1 0

git:5.1:e5a19d4e: schema: allow null in active_watchers reason
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: e5a19d4e073b6cd8c910896792bb44c80b9c12ec URL: https://github.com/kamailio/kamailio/commit/e5a19d4e073b6cd8c910896792bb44c… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T09:23:18+01:00 schema: allow null in active_watchers reason (cherry picked from commit 2eccc2342b929fea96bd006f386948f483e62d06) --- Modified: src/lib/srdb1/schema/pr_active_watchers.xml --- Diff: https://github.com/kamailio/kamailio/commit/e5a19d4e073b6cd8c910896792bb44c… Patch: https://github.com/kamailio/kamailio/commit/e5a19d4e073b6cd8c910896792bb44c… --- diff --git a/src/lib/srdb1/schema/pr_active_watchers.xml b/src/lib/srdb1/schema/pr_active_watchers.xml index 7f064b9c70..8e4fd0604d 100644 --- a/src/lib/srdb1/schema/pr_active_watchers.xml +++ b/src/lib/srdb1/schema/pr_active_watchers.xml @@ -153,6 +153,7 @@ <name>reason</name> <type>string</type> <size>&user_len;</size> + <null/> <description>Reason</description> </column>

1 0

git:master:900f2a15: kamctl: regenerated scripts to create database structure for presence
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 900f2a1559ea2b83387fc30195c41c6fd47402f7 URL: https://github.com/kamailio/kamailio/commit/900f2a1559ea2b83387fc30195c41c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T09:21:46+01:00 kamctl: regenerated scripts to create database structure for presence --- Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/dbtext/kamailio/active_watchers Modified: utils/kamctl/mongodb/kamailio/active_watchers.json Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/900f2a1559ea2b83387fc30195c41c6… Patch: https://github.com/kamailio/kamailio/commit/900f2a1559ea2b83387fc30195c41c6… --- diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index a84ee99965..c4d01296a7 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -35,7 +35,7 @@ CREATE TABLE active_watchers ( record_route TEXT, expires INTEGER NOT NULL, status INTEGER DEFAULT 2 NOT NULL, - reason VARCHAR(64) NOT NULL, + reason VARCHAR(64), version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/active_watchers b/utils/kamctl/dbtext/kamailio/active_watchers index b4053a323e..19719b72d5 100644 --- a/utils/kamctl/dbtext/kamailio/active_watchers +++ b/utils/kamctl/dbtext/kamailio/active_watchers @@ -1 +1 @@ -id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string) +id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string,null) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string) diff --git a/utils/kamctl/mongodb/kamailio/active_watchers.json b/utils/kamctl/mongodb/kamailio/active_watchers.json index adc1d27d0d..123692d988 100644 --- a/utils/kamctl/mongodb/kamailio/active_watchers.json +++ b/utils/kamctl/mongodb/kamailio/active_watchers.json @@ -90,7 +90,7 @@ "reason": { "type": "string", "default": null, - "null": false + "null": true }, "version": { "type": "int", diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index c4423b508e..95d85cdc19 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -35,7 +35,7 @@ CREATE TABLE `active_watchers` ( `record_route` TEXT, `expires` INT(11) NOT NULL, `status` INT(11) DEFAULT 2 NOT NULL, - `reason` VARCHAR(64) NOT NULL, + `reason` VARCHAR(64), `version` INT(11) DEFAULT 0 NOT NULL, `socket_info` VARCHAR(64) NOT NULL, `local_contact` VARCHAR(128) NOT NULL, diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index aa0efc8034..698352ca16 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -35,7 +35,7 @@ CREATE TABLE active_watchers ( record_route TEXT, expires INTEGER NOT NULL, status INTEGER DEFAULT 2 NOT NULL, - reason VARCHAR(64) NOT NULL, + reason VARCHAR(64), version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL,

1 0

git:master:09cd77a9: Merge pull request #1345 from kamailio/lazedo-patch-2
by GitHub 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 09cd77a9f366d4a534274f0fa7d5ef663c97077e URL: https://github.com/kamailio/kamailio/commit/09cd77a9f366d4a534274f0fa7d5ef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-12-09T09:20:00+01:00 Merge pull request #1345 from kamailio/lazedo-patch-2 schema: allow null in active_watchers reason --- Modified: src/lib/srdb1/schema/pr_active_watchers.xml --- Diff: https://github.com/kamailio/kamailio/commit/09cd77a9f366d4a534274f0fa7d5ef6… Patch: https://github.com/kamailio/kamailio/commit/09cd77a9f366d4a534274f0fa7d5ef6… --- diff --git a/src/lib/srdb1/schema/pr_active_watchers.xml b/src/lib/srdb1/schema/pr_active_watchers.xml index 7f064b9c70..8e4fd0604d 100644 --- a/src/lib/srdb1/schema/pr_active_watchers.xml +++ b/src/lib/srdb1/schema/pr_active_watchers.xml @@ -153,6 +153,7 @@ <name>reason</name> <type>string</type> <size>&user_len;</size> + <null/> <description>Reason</description> </column>

1 0

git:master:2eccc234: schema: allow null in active_watchers reason
by GitHub 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: 2eccc2342b929fea96bd006f386948f483e62d06 URL: https://github.com/kamailio/kamailio/commit/2eccc2342b929fea96bd006f386948f… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-29T10:15:27Z schema: allow null in active_watchers reason --- Modified: src/lib/srdb1/schema/pr_active_watchers.xml --- Diff: https://github.com/kamailio/kamailio/commit/2eccc2342b929fea96bd006f386948f… Patch: https://github.com/kamailio/kamailio/commit/2eccc2342b929fea96bd006f386948f… --- diff --git a/src/lib/srdb1/schema/pr_active_watchers.xml b/src/lib/srdb1/schema/pr_active_watchers.xml index 7f064b9c70..8e4fd0604d 100644 --- a/src/lib/srdb1/schema/pr_active_watchers.xml +++ b/src/lib/srdb1/schema/pr_active_watchers.xml @@ -153,6 +153,7 @@ <name>reason</name> <type>string</type> <size>&user_len;</size> + <null/> <description>Reason</description> </column>

1 0

[kamailio/kamailio] schema: allow null in active_watchers reason (#1345)
by lazedo 09 Dec '17

09 Dec '17

some code paths in presence module set the `reason` field to null causing problems updating the database. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1345 -- Commit Summary -- * schema: allow null in active_watchers reason -- File Changes -- M src/lib/srdb1/schema/pr_active_watchers.xml (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1345.patch https://github.com/kamailio/kamailio/pull/1345.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/1345

2 7

git:5.1:a4f2a398: ipops: exported functions to kemi framework
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: a4f2a398c6bf3009955d43c4bfcae76d0c5fa23f URL: https://github.com/kamailio/kamailio/commit/a4f2a398c6bf3009955d43c4bfcae76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T09:14:25+01:00 ipops: exported functions to kemi framework (cherry picked from commit c11af868d6c945a0a83a3b20c1b46319f139b2c5) --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a4f2a398c6bf3009955d43c4bfcae76… Patch: https://github.com/kamailio/kamailio/commit/a4f2a398c6bf3009955d43c4bfcae76…

1 0

git:5.1:47f31473: ipops: use sip_msg_t type
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: 5.1 Commit: 47f3147385e827e309f49d13d4b7bcaeb8aef752 URL: https://github.com/kamailio/kamailio/commit/47f3147385e827e309f49d13d4b7bca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T09:14:15+01:00 ipops: use sip_msg_t type - set cfg functions signatures with two parameters (cherry picked from commit d88572eeb90ca63a07aac15a719a99e5c77b18af) --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/47f3147385e827e309f49d13d4b7bca… Patch: https://github.com/kamailio/kamailio/commit/47f3147385e827e309f49d13d4b7bca…

1 0

git:master:c11af868: ipops: exported functions to kemi framework
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: c11af868d6c945a0a83a3b20c1b46319f139b2c5 URL: https://github.com/kamailio/kamailio/commit/c11af868d6c945a0a83a3b20c1b4631… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-09T08:55:25+01:00 ipops: exported functions to kemi framework --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c11af868d6c945a0a83a3b20c1b4631… Patch: https://github.com/kamailio/kamailio/commit/c11af868d6c945a0a83a3b20c1b4631…

1 0

git:master:d88572ee: ipops: use sip_msg_t type
by Daniel-Constantin Mierla 09 Dec '17

09 Dec '17

Module: kamailio Branch: master Commit: d88572eeb90ca63a07aac15a719a99e5c77b18af URL: https://github.com/kamailio/kamailio/commit/d88572eeb90ca63a07aac15a719a99e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T23:08:25+01:00 ipops: use sip_msg_t type - set cfg functions signatures with two parameters --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d88572eeb90ca63a07aac15a719a99e… Patch: https://github.com/kamailio/kamailio/commit/d88572eeb90ca63a07aac15a719a99e…

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,jessie,slave #984
by jenkins＠sipwise.com 08 Dec '17

08 Dec '17

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 416.37 KB...] CC (gcc) [M ims_charging.so] diameter_ro.o CC (gcc) [M ims_charging.so] ro_db_handler.o CC (gcc) [M ims_charging.so] ro_fixup.o CC (gcc) [M ims_charging.so] Ro_data.o make[4]: 'libkamailio_ims.so.0.1' is up to date. make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M ims_charging.so] ims_charging.so CC (gcc) [M ims_ocs.so] ims_ocs_mod.o CC (gcc) [M ims_ocs.so] ocs_avp_helper.o CC (gcc) [M ims_ocs.so] msg_faker.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_ocs.so] ims_ocs.so CC (gcc) [M ims_diameter_server.so] ims_diameter_server.o CC (gcc) [M ims_diameter_server.so] cJSON.o CC (gcc) [M ims_diameter_server.so] avp_helper.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_diameter_server.so] ims_diameter_server.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="ksctp" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M sctp.so] sctp_mod.o CC (gcc) [M sctp.so] sctp_rpc.o CC (gcc) [M sctp.so] sctp_options.o CC (gcc) [M sctp.so] sctp_stats.o CC (gcc) [M sctp.so] sctp_server.o LD (gcc) [M sctp.so] sctp.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kjava" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M app_java.so] java_msgobj.o CC (gcc) [M app_java.so] java_support.o CC (gcc) [M app_java.so] java_iface.o CC (gcc) [M app_java.so] java_native_methods.o CC (gcc) [M app_java.so] app_java_mod.o CC (gcc) [M app_java.so] java_sig_parser.o CC (gcc) [M app_java.so] utils.o LD (gcc) [M app_java.so] app_java.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="ktls" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M crypto.so] crypto_uuid.o CC (gcc) [M crypto.so] crypto_mod.o LD (gcc) [M crypto.so] crypto.so CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_locking.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_init.o CC (gcc) [M tls.so] tls_config.o CC (gcc) [M tls.so] tls_mod.o CC (gcc) [M tls.so] tls_bio.o CC (gcc) [M tls.so] tls_rpc.o CC (gcc) [M tls.so] tls_ct_wrq.o CC (gcc) [M tls.so] tls_verify.o LD (gcc) [M tls.so] tls.so CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_tables.o CC (gcc) [M auth_identity.so] auth_identity.o CC (gcc) [M auth_identity.so] auth_crypt.o CC (gcc) [M auth_identity.so] auth_dynstr.o LD (gcc) [M auth_identity.so] auth_identity.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="koutbound" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M outbound.so] config.o CC (gcc) [M outbound.so] outbound_mod.o LD (gcc) [M outbound.so] outbound.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kwebsocket" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M websocket.so] websocket.o CC (gcc) [M websocket.so] ws_frame.o CC (gcc) [M websocket.so] config.o CC (gcc) [M websocket.so] ws_handshake.o CC (gcc) [M websocket.so] ws_conn.o LD (gcc) [M websocket.so] websocket.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kautheph" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M auth_ephemeral.so] checks.o CC (gcc) [M auth_ephemeral.so] authorize.o CC (gcc) [M auth_ephemeral.so] auth_ephemeral_mod.o LD (gcc) [M auth_ephemeral.so] auth_ephemeral.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kdnssec" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M dnssec.so] dnssec_func.o CC (gcc) [M dnssec.so] dnssec_mod.o LD (gcc) [M dnssec.so] dnssec.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kkazoo" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M kazoo.so] const.o CC (gcc) [M kazoo.so] kz_trans.o CC (gcc) [M kazoo.so] kz_amqp.o CC (gcc) [M kazoo.so] kz_hash.o CC (gcc) [M kazoo.so] kazoo.o CC (gcc) [M kazoo.so] kz_json.o CC (gcc) [M kazoo.so] kz_pua.o CC (gcc) [M kazoo.so] kz_fixup.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M kazoo.so] kazoo.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kcnxcc" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M cnxcc.so] cnxcc_redis.o CC (gcc) [M cnxcc.so] cnxcc_sip_msg_faker.o CC (gcc) [M cnxcc.so] cnxcc_check.o CC (gcc) [M cnxcc.so] cnxcc_select.o CC (gcc) [M cnxcc.so] cnxcc.o CC (gcc) [M cnxcc.so] cnxcc_mod.o CC (gcc) [M cnxcc.so] cnxcc_rpc.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M cnxcc.so] cnxcc.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kerlang" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M erlang.so] erl_helpers.o CC (gcc) [M erlang.so] handle_rpc.o CC (gcc) [M erlang.so] pv_list.o CC (gcc) [M erlang.so] pv_ref.o CC (gcc) [M erlang.so] handle_emsg.o CC (gcc) [M erlang.so] cnode.o CC (gcc) [M erlang.so] pv_pid.o CC (gcc) [M erlang.so] pv_tuple.o CC (gcc) [M erlang.so] pv_xbuff.o CC (gcc) [M erlang.so] erlang_mod.o CC (gcc) [M erlang.so] pv_atom.o CC (gcc) [M erlang.so] epmd.o CC (gcc) [M erlang.so] erl_api.o CC (gcc) [M erlang.so] worker.o LD (gcc) [M erlang.so] erlang.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="ksystemd" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M log_systemd.so] journal_send.o CC (gcc) [M log_systemd.so] log_systemd_mod.o LD (gcc) [M log_systemd.so] log_systemd.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kphonenum" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M phonenum.so] phonenum_mod.o CC (gcc) [M phonenum.so] phonenum_pv.o Compiling cphonenumber.cpp g++ -fPIC -DPIC -funroll-loops -Wcast-align -m32 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=athlon64 -Wall -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing -fPIC -DPIC -funroll-loops -Wcast-align -m32 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=athlon64 -Wall -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.2.0-dev1"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.9.2"' -D__CPU_i386 -D__OS_linux -DSER_VER=5002000 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -I/opt/local/include -DKAMAILIO_MOD_INTERFACE -DMOD_NAME='"phonenum"' -c cphonenumber.cpp -o cphonenumber.o In file included from cphonenumber.cpp:24:0: /usr/include/phonenumbers/geocoding/phonenumber_offline_geocoder.h:23:59: fatal error: unicode/locid.h: No such file or directory #include <unicode/locid.h> // NOLINT(build/include_order) ^ compilation terminated. Makefile:22: recipe for target 'cphonenumber.o' failed make[3]: *** [cphonenumber.o] Error 1 Makefile:511: recipe for target 'modules' failed make[2]: *** [modules] Error 1 make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' Makefile:27: recipe for target 'every-module' failed make[1]: *** [every-module] Error 2 make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' debian/rules:137: recipe for target 'build-stamp' failed make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build-arch gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.31121/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.31121/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_P76VAZ filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.31121 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/jessie-i386.building.25023 + '[' -r /var/run/lock/jessie-i386.update.25023 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.ar3NPcnd3k ']' + rm -rf /tmp/tmp.ar3NPcnd3k + '[' -n /tmp/apt-jdg_P76VAZ ']' + sudo rm -rf /tmp/apt-jdg_P76VAZ + '[' -n 14773 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=377 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Fri Dec 8 13:17:18 UTC 2017 [running 377 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Fri Dec 8 13:17:18 UTC 2017 [running 377 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,jessie,slave #984
by jenkins＠sipwise.com 08 Dec '17

08 Dec '17

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 396.18 KB...] CC (gcc) [M ims_charging.so] diameter_ro.o CC (gcc) [M ims_charging.so] ro_db_handler.o CC (gcc) [M ims_charging.so] ro_fixup.o CC (gcc) [M ims_charging.so] Ro_data.o make[4]: 'libkamailio_ims.so.0.1' is up to date. make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M ims_charging.so] ims_charging.so CC (gcc) [M ims_ocs.so] ims_ocs_mod.o CC (gcc) [M ims_ocs.so] ocs_avp_helper.o CC (gcc) [M ims_ocs.so] msg_faker.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_ocs.so] ims_ocs.so CC (gcc) [M ims_diameter_server.so] ims_diameter_server.o CC (gcc) [M ims_diameter_server.so] cJSON.o CC (gcc) [M ims_diameter_server.so] avp_helper.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_diameter_server.so] ims_diameter_server.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="ksctp" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M sctp.so] sctp_mod.o CC (gcc) [M sctp.so] sctp_rpc.o CC (gcc) [M sctp.so] sctp_options.o CC (gcc) [M sctp.so] sctp_stats.o CC (gcc) [M sctp.so] sctp_server.o LD (gcc) [M sctp.so] sctp.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kjava" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M app_java.so] java_msgobj.o CC (gcc) [M app_java.so] java_support.o CC (gcc) [M app_java.so] java_iface.o CC (gcc) [M app_java.so] java_native_methods.o CC (gcc) [M app_java.so] app_java_mod.o CC (gcc) [M app_java.so] java_sig_parser.o CC (gcc) [M app_java.so] utils.o LD (gcc) [M app_java.so] app_java.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="ktls" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M crypto.so] crypto_uuid.o CC (gcc) [M crypto.so] crypto_mod.o LD (gcc) [M crypto.so] crypto.so CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_locking.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_init.o CC (gcc) [M tls.so] tls_config.o CC (gcc) [M tls.so] tls_mod.o CC (gcc) [M tls.so] tls_bio.o CC (gcc) [M tls.so] tls_rpc.o CC (gcc) [M tls.so] tls_ct_wrq.o CC (gcc) [M tls.so] tls_verify.o LD (gcc) [M tls.so] tls.so CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_tables.o CC (gcc) [M auth_identity.so] auth_identity.o CC (gcc) [M auth_identity.so] auth_crypt.o CC (gcc) [M auth_identity.so] auth_dynstr.o LD (gcc) [M auth_identity.so] auth_identity.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="koutbound" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M outbound.so] config.o CC (gcc) [M outbound.so] outbound_mod.o LD (gcc) [M outbound.so] outbound.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kwebsocket" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M websocket.so] websocket.o CC (gcc) [M websocket.so] ws_frame.o CC (gcc) [M websocket.so] config.o CC (gcc) [M websocket.so] ws_handshake.o CC (gcc) [M websocket.so] ws_conn.o LD (gcc) [M websocket.so] websocket.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kautheph" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M auth_ephemeral.so] checks.o CC (gcc) [M auth_ephemeral.so] authorize.o CC (gcc) [M auth_ephemeral.so] auth_ephemeral_mod.o LD (gcc) [M auth_ephemeral.so] auth_ephemeral.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kdnssec" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M dnssec.so] dnssec_func.o CC (gcc) [M dnssec.so] dnssec_mod.o LD (gcc) [M dnssec.so] dnssec.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kkazoo" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M kazoo.so] const.o CC (gcc) [M kazoo.so] kz_trans.o CC (gcc) [M kazoo.so] kz_amqp.o CC (gcc) [M kazoo.so] kz_hash.o CC (gcc) [M kazoo.so] kazoo.o CC (gcc) [M kazoo.so] kz_json.o CC (gcc) [M kazoo.so] kz_pua.o CC (gcc) [M kazoo.so] kz_fixup.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M kazoo.so] kazoo.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kcnxcc" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M cnxcc.so] cnxcc_redis.o CC (gcc) [M cnxcc.so] cnxcc_sip_msg_faker.o CC (gcc) [M cnxcc.so] cnxcc_check.o CC (gcc) [M cnxcc.so] cnxcc_select.o CC (gcc) [M cnxcc.so] cnxcc.o CC (gcc) [M cnxcc.so] cnxcc_mod.o CC (gcc) [M cnxcc.so] cnxcc_rpc.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M cnxcc.so] cnxcc.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kerlang" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M erlang.so] erl_helpers.o CC (gcc) [M erlang.so] handle_rpc.o CC (gcc) [M erlang.so] pv_list.o CC (gcc) [M erlang.so] pv_ref.o CC (gcc) [M erlang.so] handle_emsg.o CC (gcc) [M erlang.so] cnode.o CC (gcc) [M erlang.so] pv_pid.o CC (gcc) [M erlang.so] pv_tuple.o CC (gcc) [M erlang.so] pv_xbuff.o CC (gcc) [M erlang.so] erlang_mod.o CC (gcc) [M erlang.so] pv_atom.o CC (gcc) [M erlang.so] epmd.o CC (gcc) [M erlang.so] erl_api.o CC (gcc) [M erlang.so] worker.o LD (gcc) [M erlang.so] erlang.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="ksystemd" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M log_systemd.so] journal_send.o CC (gcc) [M log_systemd.so] log_systemd_mod.o LD (gcc) [M log_systemd.so] log_systemd.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make every-module group_include="kphonenum" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' CC (gcc) [M phonenum.so] phonenum_mod.o CC (gcc) [M phonenum.so] phonenum_pv.o Compiling cphonenumber.cpp g++ -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.2.0-dev1"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.9.2"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5002000 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -I/opt/local/include -DKAMAILIO_MOD_INTERFACE -DMOD_NAME='"phonenum"' -c cphonenumber.cpp -o cphonenumber.o In file included from cphonenumber.cpp:24:0: /usr/include/phonenumbers/geocoding/phonenumber_offline_geocoder.h:23:59: fatal error: unicode/locid.h: No such file or directory #include <unicode/locid.h> // NOLINT(build/include_order) ^ compilation terminated. Makefile:22: recipe for target 'cphonenumber.o' failed make[3]: *** [cphonenumber.o] Error 1 Makefile:511: recipe for target 'modules' failed make[2]: *** [modules] Error 1 make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie/src' Makefile:27: recipe for target 'every-module' failed make[1]: *** [every-module] Error 2 make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev1+0~20171208114049.988+jessie' debian/rules:137: recipe for target 'build-stamp' failed make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.20911/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.20911/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_IOYBHW filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.20911 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/jessie-amd64.building.14974 + '[' -r /var/run/lock/jessie-amd64.update.14974 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.zAfp9rLC9c ']' + rm -rf /tmp/tmp.zAfp9rLC9c + '[' -n /tmp/apt-jdg_IOYBHW ']' + sudo rm -rf /tmp/apt-jdg_IOYBHW + '[' -n 12017 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=374 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Fri Dec 8 12:31:19 UTC 2017 [running 374 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Fri Dec 8 12:31:19 UTC 2017 [running 374 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

git:5.1:b8698724: rls: avoid walking a null string
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: b8698724134095814339701c19f0d02bb37caa89 URL: https://github.com/kamailio/kamailio/commit/b8698724134095814339701c19f0d02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:55:31+01:00 rls: avoid walking a null string (cherry picked from commit 5f62d05180c7148f3899732dfc0da44034a314f8) --- Modified: src/modules/rls/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/b8698724134095814339701c19f0d02… Patch: https://github.com/kamailio/kamailio/commit/b8698724134095814339701c19f0d02… --- diff --git a/src/modules/rls/notify.c b/src/modules/rls/notify.c index 9b5c3a5806..55a7019032 100644 --- a/src/modules/rls/notify.c +++ b/src/modules/rls/notify.c @@ -1220,7 +1220,7 @@ int parse_xcap_uri(char *uri, str *host, unsigned short *port, str *path) } } - while(path->s[path->len] != '\0') path->len++; + while(path->s != NULL && path->s[path->len] != '\0') path->len++; return 1; }

1 0

git:5.1:a0bbb141: sipdump: safety check for received address
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: a0bbb14169eb82ffe5936c0fe73a5cc943407e83 URL: https://github.com/kamailio/kamailio/commit/a0bbb14169eb82ffe5936c0fe73a5cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:55:42+01:00 sipdump: safety check for received address (cherry picked from commit f6a05336de65bb929854c5843e5aa821901b63eb) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a0bbb14169eb82ffe5936c0fe73a5cc… Patch: https://github.com/kamailio/kamailio/commit/a0bbb14169eb82ffe5936c0fe73a5cc… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index c95e0b091a..3247d71a70 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -229,7 +229,8 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) } sdi.af.len = 4; - if(msg->rcv.bind_address->address.af==AF_INET6) { + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->address.af==AF_INET6) { sdi.af.s = "ipv6"; } else { sdi.af.s = "ipv4"; @@ -298,7 +299,8 @@ int sipdump_msg_received(sr_event_param_t *evp) sdi.dst_port = (int)evp->rcv->bind_address->port_no; } sdi.af.len = 4; - if(evp->rcv->bind_address->address.af==AF_INET6) { + if(evp->rcv->bind_address!=NULL + && evp->rcv->bind_address->address.af==AF_INET6) { sdi.af.s = "ipv6"; } else { sdi.af.s = "ipv4";

1 0

git:5.1:7b4a653a: pua: safety check for params values
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: 7b4a653abef51afe6a6289048ed989ba969c1310 URL: https://github.com/kamailio/kamailio/commit/7b4a653abef51afe6a6289048ed989b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:55:22+01:00 pua: safety check for params values (cherry picked from commit a009a5bf4f145b4e877e5ba41d218607c30849ec) --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/7b4a653abef51afe6a6289048ed989b… Patch: https://github.com/kamailio/kamailio/commit/7b4a653abef51afe6a6289048ed989b… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index 89b597a77a..b75290b936 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -803,7 +803,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) hentity->contact.len= subs->contact->len; size+= subs->contact->len; - if(subs->outbound_proxy) + if(subs->outbound_proxy && subs->outbound_proxy->s) { hentity->outbound_proxy= (str*)((char*)hentity+ size); size+= sizeof(str); @@ -821,7 +821,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) { CONT_COPY(hentity, hentity->id, subs->id); } - if(subs->extra_headers) + if(subs->extra_headers && hentity->extra_headers->s) { hentity->extra_headers= (str*)((char*)hentity+ size); size+= sizeof(str);

1 0

git:5.1:968722b7: auth_ephemeral: init the return code
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: 968722b7b6769c1416cc35b23969b06ce3416181 URL: https://github.com/kamailio/kamailio/commit/968722b7b6769c1416cc35b23969b06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:55:14+01:00 auth_ephemeral: init the return code (cherry picked from commit 236b0b4bca0ce8931bd06fd88720f3293b651682) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/968722b7b6769c1416cc35b23969b06… Patch: https://github.com/kamailio/kamailio/commit/968722b7b6769c1416cc35b23969b06… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 8e4489947c..745f12d7ab 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -213,7 +213,7 @@ static inline int digest_authenticate(struct sip_msg *_m, str *_realm, hdr_types_t _hftype, str *_method) { struct hdr_field* h; - auth_cfg_result_t ret; + auth_cfg_result_t ret = AUTH_ERROR; auth_result_t rauth; struct secret *secret_struct; str username; @@ -548,4 +548,4 @@ int autheph_authenticate(struct sip_msg *_m, char *_username, char *_password) } return ki_autheph_authenticate(_m, &susername, &spassword); -} \ No newline at end of file +}

1 0

git:5.1:9c4c8b14: core: select - init proto string to udp
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: 9c4c8b14ddcb26b9514fb91f660b18ba12ea4572 URL: https://github.com/kamailio/kamailio/commit/9c4c8b14ddcb26b9514fb91f660b18b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:54:56+01:00 core: select - init proto string to udp (cherry picked from commit da31e70a2c63454dd7126d6ed47be977f36c73f0) --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/9c4c8b14ddcb26b9514fb91f660b18b… Patch: https://github.com/kamailio/kamailio/commit/9c4c8b14ddcb26b9514fb91f660b18b… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index d1f2ae7b4d..112dee489e 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -1286,7 +1286,7 @@ ABSTRACT_F(select_dst) ABSTRACT_F(select_rcv) int select_ip_port(str* res, select_t* s, struct sip_msg* msg) { - str ip_str=STR_NULL, port_str=STR_NULL, proto_str=STR_NULL; + str ip_str=STR_NULL, port_str=STR_NULL, proto_str=str_init("udp"); int param, pos;

1 0

git:5.1:d8696328: tls: safety checks for select values
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: d86963283cd7a58d94929959ca09ed31ae9bd116 URL: https://github.com/kamailio/kamailio/commit/d86963283cd7a58d94929959ca09ed3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:55:06+01:00 tls: safety checks for select values (cherry picked from commit 084364becd2f6f5d6e620721cb0837466c3a2f31) --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/d86963283cd7a58d94929959ca09ed3… Patch: https://github.com/kamailio/kamailio/commit/d86963283cd7a58d94929959ca09ed3… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index c1c44c3763..ba765ff755 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -198,7 +198,11 @@ static int get_cipher(str* res, sip_msg_t* msg) ERR("Cipher name too long\n"); goto err; } - memcpy(buf, cipher.s, cipher.len); + if(cipher.s!=NULL && cipher.len>0) { + memcpy(buf, cipher.s, cipher.len); + } else { + buf[0] = '\0'; + } res->s = buf; res->len = cipher.len; tcpconn_put(c); @@ -298,7 +302,11 @@ static int get_version(str* res, sip_msg_t* msg) ERR("Version string too long\n"); goto err; } - memcpy(buf, version.s, version.len); + if(version.s!=NULL && version.len>0) { + memcpy(buf, version.s, version.len); + } else { + buf[0] = '\0'; + } res->s = buf; res->len = version.len; tcpconn_put(c);

1 0

git:5.1:8f1872a2: core: receive - clang format the code
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: 8f1872a27b406cfcd3300595c06ab53cb79eb082 URL: https://github.com/kamailio/kamailio/commit/8f1872a27b406cfcd3300595c06ab53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:54:47+01:00 core: receive - clang format the code (cherry picked from commit b9bbeeb11df841845d9f00897008fedf2c2eb9b6) --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/8f1872a27b406cfcd3300595c06ab53… Patch: https://github.com/kamailio/kamailio/commit/8f1872a27b406cfcd3300595c06ab53…

1 0

git:5.1:edb3c0ab: db2_ops: safety check for input parameter
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: edb3c0abfc2712aef8e6ec562aa0d2170dc81120 URL: https://github.com/kamailio/kamailio/commit/edb3c0abfc2712aef8e6ec562aa0d21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:54:38+01:00 db2_ops: safety check for input parameter (cherry picked from commit 1be7a6903ace085e7518fa0d358a4ca899ee938f) --- Modified: src/modules/db2_ops/db2_ops.c Modified: src/modules/jsonrpcc/jsonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/edb3c0abfc2712aef8e6ec562aa0d21… Patch: https://github.com/kamailio/kamailio/commit/edb3c0abfc2712aef8e6ec562aa0d21… --- diff --git a/src/modules/db2_ops/db2_ops.c b/src/modules/db2_ops/db2_ops.c index 647faceb1c..dca2c81a1c 100644 --- a/src/modules/db2_ops/db2_ops.c +++ b/src/modules/db2_ops/db2_ops.c @@ -201,6 +201,9 @@ static int split_fields(char *part, int *n, struct xlstr **strs) { int i, res; char *c, *fld; + if(part==NULL || *part=='\0') + return -1; + *n = 0; *strs = 0; c = part; diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c index ae96ace9c0..ddefd1b3a1 100644 --- a/src/modules/jsonrpcc/jsonrpc_io.c +++ b/src/modules/jsonrpcc/jsonrpc_io.c @@ -219,6 +219,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) if (timerfd_settime(timerfd, 0, itime, NULL) == -1) { LM_ERR("Could not set timer."); + pkg_free(itime); goto error; } pkg_free(itime);

1 0

git:5.1:e5d96dec: db_postgres: avoid potential double free if sb url parsing fails
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: e5d96dec3f986a2d98ea5e3c09da1fac3f45c14a URL: https://github.com/kamailio/kamailio/commit/e5d96dec3f986a2d98ea5e3c09da1fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:54:29+01:00 db_postgres: avoid potential double free if sb url parsing fails (cherry picked from commit 3614b4e66d1b57dc722139fc0e1ccd8d838f13ee) --- Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/e5d96dec3f986a2d98ea5e3c09da1fa… Patch: https://github.com/kamailio/kamailio/commit/e5d96dec3f986a2d98ea5e3c09da1fa… --- diff --git a/src/modules/db_postgres/pg_uri.c b/src/modules/db_postgres/pg_uri.c index 6170de310e..3e4f9a32bc 100644 --- a/src/modules/db_postgres/pg_uri.c +++ b/src/modules/db_postgres/pg_uri.c @@ -255,8 +255,10 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) return 0; err: - if(prev_token) - pkg_free(prev_token); + if(prev_token) { + if(res==NULL || (res->username!=prev_token && res->host!=prev_token)) + pkg_free(prev_token); + } if(res == NULL) return -1; if(res->username) {

1 0

git:5.1:c31f33de: cplc: null terminate log string
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: c31f33de17067cbe29042b4558f28aad59ec25f0 URL: https://github.com/kamailio/kamailio/commit/c31f33de17067cbe29042b4558f28aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:54:21+01:00 cplc: null terminate log string - reset field to avoid double free (cherry picked from commit 66051f400c0a1dcd472f0c9a7957b24e9cb54a07) --- Modified: src/modules/cplc/cpl_log.c Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/c31f33de17067cbe29042b4558f28aa… Patch: https://github.com/kamailio/kamailio/commit/c31f33de17067cbe29042b4558f28aa… --- diff --git a/src/modules/cplc/cpl_log.c b/src/modules/cplc/cpl_log.c index 195b11c7b7..39ad19b32f 100644 --- a/src/modules/cplc/cpl_log.c +++ b/src/modules/cplc/cpl_log.c @@ -84,7 +84,7 @@ void compile_logs( str *log) log->len += cpl_logs[i].len; /* get a buffer */ - log->s = (char*)pkg_malloc(log->len); + log->s = (char*)pkg_malloc(log->len+1); if (log->s==0) { LM_ERR("no more pkg mem\n"); log->len = 0; @@ -97,6 +97,7 @@ void compile_logs( str *log) memcpy( p, cpl_logs[i].s, cpl_logs[i].len); p += cpl_logs[i].len; } + log->s[log->len] = '\0'; return; } diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index 36758f8e19..653c3a2352 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -328,6 +328,7 @@ int tr_byxxx_init(tr_byxxx_p _bxp, int _nr) if(!_bxp->req) { pkg_free(_bxp->xxx); + _bxp->xxx = NULL; return -1; }

1 0

git:master:f6a05336: sipdump: safety check for received address
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: f6a05336de65bb929854c5843e5aa821901b63eb URL: https://github.com/kamailio/kamailio/commit/f6a05336de65bb929854c5843e5aa82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 sipdump: safety check for received address --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f6a05336de65bb929854c5843e5aa82… Patch: https://github.com/kamailio/kamailio/commit/f6a05336de65bb929854c5843e5aa82… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index c95e0b091a..3247d71a70 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -229,7 +229,8 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) } sdi.af.len = 4; - if(msg->rcv.bind_address->address.af==AF_INET6) { + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->address.af==AF_INET6) { sdi.af.s = "ipv6"; } else { sdi.af.s = "ipv4"; @@ -298,7 +299,8 @@ int sipdump_msg_received(sr_event_param_t *evp) sdi.dst_port = (int)evp->rcv->bind_address->port_no; } sdi.af.len = 4; - if(evp->rcv->bind_address->address.af==AF_INET6) { + if(evp->rcv->bind_address!=NULL + && evp->rcv->bind_address->address.af==AF_INET6) { sdi.af.s = "ipv6"; } else { sdi.af.s = "ipv4";

1 0

git:master:a009a5bf: pua: safety check for params values
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: a009a5bf4f145b4e877e5ba41d218607c30849ec URL: https://github.com/kamailio/kamailio/commit/a009a5bf4f145b4e877e5ba41d21860… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 pua: safety check for params values --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/a009a5bf4f145b4e877e5ba41d21860… Patch: https://github.com/kamailio/kamailio/commit/a009a5bf4f145b4e877e5ba41d21860… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index 89b597a77a..b75290b936 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -803,7 +803,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) hentity->contact.len= subs->contact->len; size+= subs->contact->len; - if(subs->outbound_proxy) + if(subs->outbound_proxy && subs->outbound_proxy->s) { hentity->outbound_proxy= (str*)((char*)hentity+ size); size+= sizeof(str); @@ -821,7 +821,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) { CONT_COPY(hentity, hentity->id, subs->id); } - if(subs->extra_headers) + if(subs->extra_headers && hentity->extra_headers->s) { hentity->extra_headers= (str*)((char*)hentity+ size); size+= sizeof(str);

1 0

git:master:5f62d051: rls: avoid walking a null string
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 5f62d05180c7148f3899732dfc0da44034a314f8 URL: https://github.com/kamailio/kamailio/commit/5f62d05180c7148f3899732dfc0da44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 rls: avoid walking a null string --- Modified: src/modules/rls/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/5f62d05180c7148f3899732dfc0da44… Patch: https://github.com/kamailio/kamailio/commit/5f62d05180c7148f3899732dfc0da44… --- diff --git a/src/modules/rls/notify.c b/src/modules/rls/notify.c index 9b5c3a5806..55a7019032 100644 --- a/src/modules/rls/notify.c +++ b/src/modules/rls/notify.c @@ -1220,7 +1220,7 @@ int parse_xcap_uri(char *uri, str *host, unsigned short *port, str *path) } } - while(path->s[path->len] != '\0') path->len++; + while(path->s != NULL && path->s[path->len] != '\0') path->len++; return 1; }

1 0

git:master:236b0b4b: auth_ephemeral: init the return code
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 236b0b4bca0ce8931bd06fd88720f3293b651682 URL: https://github.com/kamailio/kamailio/commit/236b0b4bca0ce8931bd06fd88720f32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 auth_ephemeral: init the return code --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/236b0b4bca0ce8931bd06fd88720f32… Patch: https://github.com/kamailio/kamailio/commit/236b0b4bca0ce8931bd06fd88720f32… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 8e4489947c..745f12d7ab 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -213,7 +213,7 @@ static inline int digest_authenticate(struct sip_msg *_m, str *_realm, hdr_types_t _hftype, str *_method) { struct hdr_field* h; - auth_cfg_result_t ret; + auth_cfg_result_t ret = AUTH_ERROR; auth_result_t rauth; struct secret *secret_struct; str username; @@ -548,4 +548,4 @@ int autheph_authenticate(struct sip_msg *_m, char *_username, char *_password) } return ki_autheph_authenticate(_m, &susername, &spassword); -} \ No newline at end of file +}

1 0

git:master:da31e70a: core: select - init proto string to udp
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: da31e70a2c63454dd7126d6ed47be977f36c73f0 URL: https://github.com/kamailio/kamailio/commit/da31e70a2c63454dd7126d6ed47be97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 core: select - init proto string to udp --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/da31e70a2c63454dd7126d6ed47be97… Patch: https://github.com/kamailio/kamailio/commit/da31e70a2c63454dd7126d6ed47be97… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index d1f2ae7b4d..112dee489e 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -1286,7 +1286,7 @@ ABSTRACT_F(select_dst) ABSTRACT_F(select_rcv) int select_ip_port(str* res, select_t* s, struct sip_msg* msg) { - str ip_str=STR_NULL, port_str=STR_NULL, proto_str=STR_NULL; + str ip_str=STR_NULL, port_str=STR_NULL, proto_str=str_init("udp"); int param, pos;

1 0

git:master:084364be: tls: safety checks for select values
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 084364becd2f6f5d6e620721cb0837466c3a2f31 URL: https://github.com/kamailio/kamailio/commit/084364becd2f6f5d6e620721cb08374… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 tls: safety checks for select values --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/084364becd2f6f5d6e620721cb08374… Patch: https://github.com/kamailio/kamailio/commit/084364becd2f6f5d6e620721cb08374… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index c1c44c3763..ba765ff755 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -198,7 +198,11 @@ static int get_cipher(str* res, sip_msg_t* msg) ERR("Cipher name too long\n"); goto err; } - memcpy(buf, cipher.s, cipher.len); + if(cipher.s!=NULL && cipher.len>0) { + memcpy(buf, cipher.s, cipher.len); + } else { + buf[0] = '\0'; + } res->s = buf; res->len = cipher.len; tcpconn_put(c); @@ -298,7 +302,11 @@ static int get_version(str* res, sip_msg_t* msg) ERR("Version string too long\n"); goto err; } - memcpy(buf, version.s, version.len); + if(version.s!=NULL && version.len>0) { + memcpy(buf, version.s, version.len); + } else { + buf[0] = '\0'; + } res->s = buf; res->len = version.len; tcpconn_put(c);

1 0

git:master:b9bbeeb1: core: receive - clang format the code
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: b9bbeeb11df841845d9f00897008fedf2c2eb9b6 URL: https://github.com/kamailio/kamailio/commit/b9bbeeb11df841845d9f00897008fed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 core: receive - clang format the code --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/b9bbeeb11df841845d9f00897008fed… Patch: https://github.com/kamailio/kamailio/commit/b9bbeeb11df841845d9f00897008fed…

1 0

git:master:1be7a690: db2_ops: safety check for input parameter
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 1be7a6903ace085e7518fa0d358a4ca899ee938f URL: https://github.com/kamailio/kamailio/commit/1be7a6903ace085e7518fa0d358a4ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 db2_ops: safety check for input parameter --- Modified: src/modules/db2_ops/db2_ops.c Modified: src/modules/jsonrpcc/jsonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/1be7a6903ace085e7518fa0d358a4ca… Patch: https://github.com/kamailio/kamailio/commit/1be7a6903ace085e7518fa0d358a4ca… --- diff --git a/src/modules/db2_ops/db2_ops.c b/src/modules/db2_ops/db2_ops.c index 647faceb1c..dca2c81a1c 100644 --- a/src/modules/db2_ops/db2_ops.c +++ b/src/modules/db2_ops/db2_ops.c @@ -201,6 +201,9 @@ static int split_fields(char *part, int *n, struct xlstr **strs) { int i, res; char *c, *fld; + if(part==NULL || *part=='\0') + return -1; + *n = 0; *strs = 0; c = part; diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c index ae96ace9c0..ddefd1b3a1 100644 --- a/src/modules/jsonrpcc/jsonrpc_io.c +++ b/src/modules/jsonrpcc/jsonrpc_io.c @@ -219,6 +219,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) if (timerfd_settime(timerfd, 0, itime, NULL) == -1) { LM_ERR("Could not set timer."); + pkg_free(itime); goto error; } pkg_free(itime);

1 0

git:master:3614b4e6: db_postgres: avoid potential double free if sb url parsing fails
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 3614b4e66d1b57dc722139fc0e1ccd8d838f13ee URL: https://github.com/kamailio/kamailio/commit/3614b4e66d1b57dc722139fc0e1ccd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 db_postgres: avoid potential double free if sb url parsing fails --- Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/3614b4e66d1b57dc722139fc0e1ccd8… Patch: https://github.com/kamailio/kamailio/commit/3614b4e66d1b57dc722139fc0e1ccd8… --- diff --git a/src/modules/db_postgres/pg_uri.c b/src/modules/db_postgres/pg_uri.c index 6170de310e..3e4f9a32bc 100644 --- a/src/modules/db_postgres/pg_uri.c +++ b/src/modules/db_postgres/pg_uri.c @@ -255,8 +255,10 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) return 0; err: - if(prev_token) - pkg_free(prev_token); + if(prev_token) { + if(res==NULL || (res->username!=prev_token && res->host!=prev_token)) + pkg_free(prev_token); + } if(res == NULL) return -1; if(res->username) {

1 0

git:master:66051f40: cplc: null terminate log string
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 66051f400c0a1dcd472f0c9a7957b24e9cb54a07 URL: https://github.com/kamailio/kamailio/commit/66051f400c0a1dcd472f0c9a7957b24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 cplc: null terminate log string - reset field to avoid double free --- Modified: src/modules/cplc/cpl_log.c Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/66051f400c0a1dcd472f0c9a7957b24… Patch: https://github.com/kamailio/kamailio/commit/66051f400c0a1dcd472f0c9a7957b24… --- diff --git a/src/modules/cplc/cpl_log.c b/src/modules/cplc/cpl_log.c index 195b11c7b7..39ad19b32f 100644 --- a/src/modules/cplc/cpl_log.c +++ b/src/modules/cplc/cpl_log.c @@ -84,7 +84,7 @@ void compile_logs( str *log) log->len += cpl_logs[i].len; /* get a buffer */ - log->s = (char*)pkg_malloc(log->len); + log->s = (char*)pkg_malloc(log->len+1); if (log->s==0) { LM_ERR("no more pkg mem\n"); log->len = 0; @@ -97,6 +97,7 @@ void compile_logs( str *log) memcpy( p, cpl_logs[i].s, cpl_logs[i].len); p += cpl_logs[i].len; } + log->s[log->len] = '\0'; return; } diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index 36758f8e19..653c3a2352 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -328,6 +328,7 @@ int tr_byxxx_init(tr_byxxx_p _bxp, int _nr) if(!_bxp->req) { pkg_free(_bxp->xxx); + _bxp->xxx = NULL; return -1; }

1 0

Build failed in Jenkins: kamailio51-nightly-binaries » amd64,jessie,slave #14
by jenkins＠sipwise.com 08 Dec '17

08 Dec '17

See <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> ------------------------------------------ [...truncated 426.19 KB...] CC (gcc) [M ims_charging.so] diameter_ro.o CC (gcc) [M ims_charging.so] ro_db_handler.o CC (gcc) [M ims_charging.so] ro_fixup.o CC (gcc) [M ims_charging.so] Ro_data.o make[4]: 'libkamailio_ims.so.0.1' is up to date. make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M ims_charging.so] ims_charging.so CC (gcc) [M ims_ocs.so] ims_ocs_mod.o CC (gcc) [M ims_ocs.so] ocs_avp_helper.o CC (gcc) [M ims_ocs.so] msg_faker.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_ocs.so] ims_ocs.so CC (gcc) [M ims_diameter_server.so] ims_diameter_server.o CC (gcc) [M ims_diameter_server.so] cJSON.o CC (gcc) [M ims_diameter_server.so] avp_helper.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_diameter_server.so] ims_diameter_server.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="ksctp" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M sctp.so] sctp_mod.o CC (gcc) [M sctp.so] sctp_rpc.o CC (gcc) [M sctp.so] sctp_options.o CC (gcc) [M sctp.so] sctp_stats.o CC (gcc) [M sctp.so] sctp_server.o LD (gcc) [M sctp.so] sctp.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kjava" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M app_java.so] java_msgobj.o CC (gcc) [M app_java.so] java_support.o CC (gcc) [M app_java.so] java_iface.o CC (gcc) [M app_java.so] java_native_methods.o CC (gcc) [M app_java.so] app_java_mod.o CC (gcc) [M app_java.so] java_sig_parser.o CC (gcc) [M app_java.so] utils.o LD (gcc) [M app_java.so] app_java.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="ktls" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M crypto.so] crypto_uuid.o CC (gcc) [M crypto.so] crypto_mod.o LD (gcc) [M crypto.so] crypto.so CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_locking.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_init.o CC (gcc) [M tls.so] tls_config.o CC (gcc) [M tls.so] tls_mod.o CC (gcc) [M tls.so] tls_bio.o CC (gcc) [M tls.so] tls_rpc.o CC (gcc) [M tls.so] tls_ct_wrq.o CC (gcc) [M tls.so] tls_verify.o LD (gcc) [M tls.so] tls.so CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_tables.o CC (gcc) [M auth_identity.so] auth_identity.o CC (gcc) [M auth_identity.so] auth_crypt.o CC (gcc) [M auth_identity.so] auth_dynstr.o LD (gcc) [M auth_identity.so] auth_identity.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="koutbound" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M outbound.so] config.o CC (gcc) [M outbound.so] outbound_mod.o LD (gcc) [M outbound.so] outbound.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kwebsocket" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M websocket.so] websocket.o CC (gcc) [M websocket.so] ws_frame.o CC (gcc) [M websocket.so] config.o CC (gcc) [M websocket.so] ws_handshake.o CC (gcc) [M websocket.so] ws_conn.o LD (gcc) [M websocket.so] websocket.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kautheph" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M auth_ephemeral.so] checks.o CC (gcc) [M auth_ephemeral.so] authorize.o CC (gcc) [M auth_ephemeral.so] auth_ephemeral_mod.o LD (gcc) [M auth_ephemeral.so] auth_ephemeral.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kdnssec" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M dnssec.so] dnssec_func.o CC (gcc) [M dnssec.so] dnssec_mod.o LD (gcc) [M dnssec.so] dnssec.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kkazoo" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M kazoo.so] const.o CC (gcc) [M kazoo.so] kz_trans.o CC (gcc) [M kazoo.so] kz_amqp.o CC (gcc) [M kazoo.so] kz_hash.o CC (gcc) [M kazoo.so] kazoo.o CC (gcc) [M kazoo.so] kz_json.o CC (gcc) [M kazoo.so] kz_pua.o CC (gcc) [M kazoo.so] kz_fixup.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M kazoo.so] kazoo.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kcnxcc" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M cnxcc.so] cnxcc_redis.o CC (gcc) [M cnxcc.so] cnxcc_sip_msg_faker.o CC (gcc) [M cnxcc.so] cnxcc_check.o CC (gcc) [M cnxcc.so] cnxcc_select.o CC (gcc) [M cnxcc.so] cnxcc.o CC (gcc) [M cnxcc.so] cnxcc_mod.o CC (gcc) [M cnxcc.so] cnxcc_rpc.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M cnxcc.so] cnxcc.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kerlang" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M erlang.so] erl_helpers.o CC (gcc) [M erlang.so] handle_rpc.o CC (gcc) [M erlang.so] pv_list.o CC (gcc) [M erlang.so] pv_ref.o CC (gcc) [M erlang.so] handle_emsg.o CC (gcc) [M erlang.so] cnode.o CC (gcc) [M erlang.so] pv_pid.o CC (gcc) [M erlang.so] pv_tuple.o CC (gcc) [M erlang.so] pv_xbuff.o CC (gcc) [M erlang.so] erlang_mod.o CC (gcc) [M erlang.so] pv_atom.o CC (gcc) [M erlang.so] epmd.o CC (gcc) [M erlang.so] erl_api.o CC (gcc) [M erlang.so] worker.o LD (gcc) [M erlang.so] erlang.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="ksystemd" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M log_systemd.so] journal_send.o CC (gcc) [M log_systemd.so] log_systemd_mod.o LD (gcc) [M log_systemd.so] log_systemd.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kphonenum" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M phonenum.so] phonenum_mod.o CC (gcc) [M phonenum.so] phonenum_pv.o Compiling cphonenumber.cpp g++ -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.1.0-rc3"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.9.2"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -I/opt/local/include -DKAMAILIO_MOD_INTERFACE -DMOD_NAME='"phonenum"' -c cphonenumber.cpp -o cphonenumber.o In file included from cphonenumber.cpp:24:0: /usr/include/phonenumbers/geocoding/phonenumber_offline_geocoder.h:23:59: fatal error: unicode/locid.h: No such file or directory #include <unicode/locid.h> // NOLINT(build/include_order) ^ compilation terminated. Makefile:22: recipe for target 'cphonenumber.o' failed make[3]: *** [cphonenumber.o] Error 1 Makefile:511: recipe for target 'modules' failed make[2]: *** [modules] Error 1 make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' Makefile:27: recipe for target 'every-module' failed make[1]: *** [every-module] Error 2 make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' debian/rules:137: recipe for target 'build-stamp' failed make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.22688/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.22688/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_sRSyba filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.22688 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/jessie-amd64.building.21557 + '[' -r /var/run/lock/jessie-amd64.update.21557 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…'> + '[' -n /tmp/tmp.xGJ3HPVmfs ']' + rm -rf /tmp/tmp.xGJ3HPVmfs + '[' -n /tmp/apt-jdg_sRSyba ']' + sudo rm -rf /tmp/apt-jdg_sRSyba + '[' -n 1830 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=448 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Fri Dec 8 13:06:49 UTC 2017 [running 448 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Fri Dec 8 13:06:49 UTC 2017 [running 448 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

Build failed in Jenkins: kamailio51-nightly-binaries » i386,jessie,slave #14
by jenkins＠sipwise.com 08 Dec '17

08 Dec '17

See <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=i…> ------------------------------------------ [...truncated 449.71 KB...] CC (gcc) [M ims_charging.so] diameter_ro.o CC (gcc) [M ims_charging.so] ro_db_handler.o CC (gcc) [M ims_charging.so] ro_fixup.o CC (gcc) [M ims_charging.so] Ro_data.o make[4]: 'libkamailio_ims.so.0.1' is up to date. make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M ims_charging.so] ims_charging.so CC (gcc) [M ims_ocs.so] ims_ocs_mod.o CC (gcc) [M ims_ocs.so] ocs_avp_helper.o CC (gcc) [M ims_ocs.so] msg_faker.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_ocs.so] ims_ocs.so CC (gcc) [M ims_diameter_server.so] ims_diameter_server.o CC (gcc) [M ims_diameter_server.so] cJSON.o CC (gcc) [M ims_diameter_server.so] avp_helper.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_diameter_server.so] ims_diameter_server.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="ksctp" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M sctp.so] sctp_mod.o CC (gcc) [M sctp.so] sctp_rpc.o CC (gcc) [M sctp.so] sctp_options.o CC (gcc) [M sctp.so] sctp_stats.o CC (gcc) [M sctp.so] sctp_server.o LD (gcc) [M sctp.so] sctp.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kjava" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M app_java.so] java_msgobj.o CC (gcc) [M app_java.so] java_support.o CC (gcc) [M app_java.so] java_iface.o CC (gcc) [M app_java.so] java_native_methods.o CC (gcc) [M app_java.so] app_java_mod.o CC (gcc) [M app_java.so] java_sig_parser.o CC (gcc) [M app_java.so] utils.o LD (gcc) [M app_java.so] app_java.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="ktls" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M crypto.so] crypto_uuid.o CC (gcc) [M crypto.so] crypto_mod.o LD (gcc) [M crypto.so] crypto.so CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_locking.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_init.o CC (gcc) [M tls.so] tls_config.o CC (gcc) [M tls.so] tls_mod.o CC (gcc) [M tls.so] tls_bio.o CC (gcc) [M tls.so] tls_rpc.o CC (gcc) [M tls.so] tls_ct_wrq.o CC (gcc) [M tls.so] tls_verify.o LD (gcc) [M tls.so] tls.so CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_tables.o CC (gcc) [M auth_identity.so] auth_identity.o CC (gcc) [M auth_identity.so] auth_crypt.o CC (gcc) [M auth_identity.so] auth_dynstr.o LD (gcc) [M auth_identity.so] auth_identity.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="koutbound" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M outbound.so] config.o CC (gcc) [M outbound.so] outbound_mod.o LD (gcc) [M outbound.so] outbound.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kwebsocket" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M websocket.so] websocket.o CC (gcc) [M websocket.so] ws_frame.o CC (gcc) [M websocket.so] config.o CC (gcc) [M websocket.so] ws_handshake.o CC (gcc) [M websocket.so] ws_conn.o LD (gcc) [M websocket.so] websocket.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kautheph" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M auth_ephemeral.so] checks.o CC (gcc) [M auth_ephemeral.so] authorize.o CC (gcc) [M auth_ephemeral.so] auth_ephemeral_mod.o LD (gcc) [M auth_ephemeral.so] auth_ephemeral.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kdnssec" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M dnssec.so] dnssec_func.o CC (gcc) [M dnssec.so] dnssec_mod.o LD (gcc) [M dnssec.so] dnssec.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kkazoo" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M kazoo.so] const.o CC (gcc) [M kazoo.so] kz_trans.o CC (gcc) [M kazoo.so] kz_amqp.o CC (gcc) [M kazoo.so] kz_hash.o CC (gcc) [M kazoo.so] kazoo.o CC (gcc) [M kazoo.so] kz_json.o CC (gcc) [M kazoo.so] kz_pua.o CC (gcc) [M kazoo.so] kz_fixup.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M kazoo.so] kazoo.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kcnxcc" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M cnxcc.so] cnxcc_redis.o CC (gcc) [M cnxcc.so] cnxcc_sip_msg_faker.o CC (gcc) [M cnxcc.so] cnxcc_check.o CC (gcc) [M cnxcc.so] cnxcc_select.o CC (gcc) [M cnxcc.so] cnxcc.o CC (gcc) [M cnxcc.so] cnxcc_mod.o CC (gcc) [M cnxcc.so] cnxcc_rpc.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M cnxcc.so] cnxcc.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kerlang" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M erlang.so] erl_helpers.o CC (gcc) [M erlang.so] handle_rpc.o CC (gcc) [M erlang.so] pv_list.o CC (gcc) [M erlang.so] pv_ref.o CC (gcc) [M erlang.so] handle_emsg.o CC (gcc) [M erlang.so] cnode.o CC (gcc) [M erlang.so] pv_pid.o CC (gcc) [M erlang.so] pv_tuple.o CC (gcc) [M erlang.so] pv_xbuff.o CC (gcc) [M erlang.so] erlang_mod.o CC (gcc) [M erlang.so] pv_atom.o CC (gcc) [M erlang.so] epmd.o CC (gcc) [M erlang.so] erl_api.o CC (gcc) [M erlang.so] worker.o LD (gcc) [M erlang.so] erlang.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="ksystemd" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M log_systemd.so] journal_send.o CC (gcc) [M log_systemd.so] log_systemd_mod.o LD (gcc) [M log_systemd.so] log_systemd.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make every-module group_include="kphonenum" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' CC (gcc) [M phonenum.so] phonenum_mod.o CC (gcc) [M phonenum.so] phonenum_pv.o Compiling cphonenumber.cpp g++ -fPIC -DPIC -funroll-loops -Wcast-align -m32 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=athlon64 -Wall -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing -fPIC -DPIC -funroll-loops -Wcast-align -m32 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=athlon64 -Wall -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.1.0-rc3"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.9.2"' -D__CPU_i386 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -I/opt/local/include -DKAMAILIO_MOD_INTERFACE -DMOD_NAME='"phonenum"' -c cphonenumber.cpp -o cphonenumber.o In file included from cphonenumber.cpp:24:0: /usr/include/phonenumbers/geocoding/phonenumber_offline_geocoder.h:23:59: fatal error: unicode/locid.h: No such file or directory #include <unicode/locid.h> // NOLINT(build/include_order) ^ compilation terminated. Makefile:22: recipe for target 'cphonenumber.o' failed make[3]: *** [cphonenumber.o] Error 1 Makefile:511: recipe for target 'modules' failed make[2]: *** [modules] Error 1 make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie/src' Makefile:27: recipe for target 'every-module' failed make[1]: *** [every-module] Error 2 make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.0~rc3+0~20171208121504.14+jessie' debian/rules:137: recipe for target 'build-stamp' failed make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build-arch gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.30743/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.30743/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_uA0IOV filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.30743 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/jessie-i386.building.30079 + '[' -r /var/run/lock/jessie-i386.update.30079 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=i…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=i…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=i…'> + '[' -n /tmp/tmp.21eZgcHAgj ']' + rm -rf /tmp/tmp.21eZgcHAgj + '[' -n /tmp/apt-jdg_uA0IOV ']' + sudo rm -rf /tmp/apt-jdg_uA0IOV + '[' -n 1339 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=484 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Fri Dec 8 12:59:15 UTC 2017 [running 484 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Fri Dec 8 12:59:15 UTC 2017 [running 484 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

git:5.1:bca9c74a: Makefile.groups: add evrexec module to extra group
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: bca9c74a4ab320452e0c4e313ef796730648b071 URL: https://github.com/kamailio/kamailio/commit/bca9c74a4ab320452e0c4e313ef7967… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T14:29:46+01:00 Makefile.groups: add evrexec module to extra group (cherry picked from commit abc9c4f73f215cf7955c14cb47944fc880eaded3) --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/bca9c74a4ab320452e0c4e313ef7967… Patch: https://github.com/kamailio/kamailio/commit/bca9c74a4ab320452e0c4e313ef7967… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index e9b670537a..52bad0b12f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -21,7 +21,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ - log_custom keepalive ss7ops app_sqlang acc_diameter + log_custom keepalive ss7ops app_sqlang acc_diameter evrexec # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

git:master:abc9c4f7: Makefile.groups: add evrexec module to extra group
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: abc9c4f73f215cf7955c14cb47944fc880eaded3 URL: https://github.com/kamailio/kamailio/commit/abc9c4f73f215cf7955c14cb47944fc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T14:25:49+01:00 Makefile.groups: add evrexec module to extra group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/abc9c4f73f215cf7955c14cb47944fc… Patch: https://github.com/kamailio/kamailio/commit/abc9c4f73f215cf7955c14cb47944fc… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index e9b670537a..52bad0b12f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -21,7 +21,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ - log_custom keepalive ss7ops app_sqlang acc_diameter + log_custom keepalive ss7ops app_sqlang acc_diameter evrexec # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

git:master:419275a5: evrexec: new module to execute an event route at startup in a dedicated process
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 419275a588d0f655d98ac80591cbd8756803b8ee URL: https://github.com/kamailio/kamailio/commit/419275a588d0f655d98ac80591cbd87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-12T10:03:33+02:00 evrexec: new module to execute an event route at startup in a dedicated process --- Added: src/modules/evrexec/Makefile Added: src/modules/evrexec/README Added: src/modules/evrexec/doc/Makefile Added: src/modules/evrexec/doc/evrexec.xml Added: src/modules/evrexec/doc/evrexec_admin.xml Added: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/419275a588d0f655d98ac80591cbd87… Patch: https://github.com/kamailio/kamailio/commit/419275a588d0f655d98ac80591cbd87…

3 4

git:5.1:6e358a40: pkg/kamailio/deb: phonenum requires libphonenum >= 7
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: 6e358a40a8493877f0e953e42d730706b93e6b01 URL: https://github.com/kamailio/kamailio/commit/6e358a40a8493877f0e953e42d73070… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T14:18:50+01:00 pkg/kamailio/deb: phonenum requires libphonenum >= 7 * remove jessie support (cherry picked from commit c804420cd30519f6a67d916b4e9201424c293690) --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/6e358a40a8493877f0e953e42d73070… Patch: https://github.com/kamailio/kamailio/commit/6e358a40a8493877f0e953e42d73070…

1 0

git:master:c804420c: pkg/kamailio/deb: phonenum requires libphonenum >= 7
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: c804420cd30519f6a67d916b4e9201424c293690 URL: https://github.com/kamailio/kamailio/commit/c804420cd30519f6a67d916b4e92014… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T14:16:52+01:00 pkg/kamailio/deb: phonenum requires libphonenum >= 7 * remove jessie support --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/c804420cd30519f6a67d916b4e92014… Patch: https://github.com/kamailio/kamailio/commit/c804420cd30519f6a67d916b4e92014…

1 0

git:5.1:bdd347b1: pkg/kamailio/deb: kamailio-phonenum-modules [skip ci]
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: bdd347b1f6c4eeaf9aaf07967d945deda84b835e URL: https://github.com/kamailio/kamailio/commit/bdd347b1f6c4eeaf9aaf07967d945de… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T12:44:57+01:00 pkg/kamailio/deb: kamailio-phonenum-modules [skip ci] (cherry picked from commit 5a2fcd525a211fe9e1b3c05788b67e6deda2c269) --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/bdd347b1f6c4eeaf9aaf07967d945de… Patch: https://github.com/kamailio/kamailio/commit/bdd347b1f6c4eeaf9aaf07967d945de…

1 0

git:5.1:de22721f: pkg/kamailio/deb: geoip2 module [skip ci]
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: de22721f09fd3776586a020d1dfa373f69a88cbd URL: https://github.com/kamailio/kamailio/commit/de22721f09fd3776586a020d1dfa373… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T12:44:57+01:00 pkg/kamailio/deb: geoip2 module [skip ci] fix #1352 (cherry picked from commit f4f2b7b201d1cc5bbb0cc915835873a1e03270ac) --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/de22721f09fd3776586a020d1dfa373… Patch: https://github.com/kamailio/kamailio/commit/de22721f09fd3776586a020d1dfa373…

1 0

git:5.1:39d85037: travis-ci: use kamailio/pkg-kamailio-docker:5.1-stretch
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: 39d85037b30837024c4efd83318bff826f5e9877 URL: https://github.com/kamailio/kamailio/commit/39d85037b30837024c4efd83318bff8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T12:44:57+01:00 travis-ci: use kamailio/pkg-kamailio-docker:5.1-stretch --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/39d85037b30837024c4efd83318bff8… Patch: https://github.com/kamailio/kamailio/commit/39d85037b30837024c4efd83318bff8… --- diff --git a/.travis.yml b/.travis.yml index d51c90349c..9b7c448d3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,11 @@ compiler: services: - docker before_install: - - docker pull kamailio/pkg-kamailio-docker:dev-stretch -script: docker run -v $TRAVIS_BUILD_DIR:/code:rw kamailio/pkg-kamailio-docker:dev-stretch /bin/bash -c "export CC=$CC; cd /code; ./test/travis/build_travis.sh" + - docker pull kamailio/pkg-kamailio-docker:5.1-stretch +script: docker run -v $TRAVIS_BUILD_DIR:/code:rw kamailio/pkg-kamailio-docker:5.1-stretch /bin/bash -c "export CC=$CC; cd /code; ./test/travis/build_travis.sh" branches: only: - - 'master' - - '/^4\.[0-9]+$/' + - '/^5\.[0-9]+$/' notifications: irc: channels:

1 0

git:master:5a2fcd52: pkg/kamailio/deb: kamailio-phonenum-modules [skip ci]
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 5a2fcd525a211fe9e1b3c05788b67e6deda2c269 URL: https://github.com/kamailio/kamailio/commit/5a2fcd525a211fe9e1b3c05788b67e6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T12:30:24+01:00 pkg/kamailio/deb: kamailio-phonenum-modules [skip ci] --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/5a2fcd525a211fe9e1b3c05788b67e6… Patch: https://github.com/kamailio/kamailio/commit/5a2fcd525a211fe9e1b3c05788b67e6…

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

- URL: https://github.com/kamailio/kamailio/commit/5047ed8a10e346064820c7064ac08e7… Author: sergey-vb <sergey.v.basov(a)gmail.com> Date: 2017-12-08T11:49:43+01:00 schema: add indexes to topos Mysql tables (#13) * topos: update topos_d.xml To optimize DB query speedup I propose to add few indexes. * topos: update topos_t.xml To optimize DB query speedup I propose to add few indexes. (cherry picked from commit 66718c2a77ae4cc427d8a06b4fa308224a5b3d48) - URL: https://github.com/kamailio/kamailio/commit/35a1fd35d8072c20e394186621e9925… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:50:23+01:00 kamctl: regenerate db creation scripts - URL: https://github.com/kamailio/kamailio/commit/7fef1fe169c587f3d6af3916cbcfde1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:50:55+01:00 app_mono: safety check beforing accessing field inside pointer - zero terminated allocated strings (cherry picked from commit 53c27ac3eb3e762110bd5cf54e55ddd85a7973a1) - URL: https://github.com/kamailio/kamailio/commit/5441aa81c7d1b8154f5e95200a1bc0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:51:03+01:00 core: pvapi - set prev variable when dropping from cache (cherry picked from commit 2fe07249426b1ae9b368a1d1ffc7f2d5b881c704) - URL: https://github.com/kamailio/kamailio/commit/b2db2741e5f973791a68910fac46a0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:51:11+01:00 core: kemi - break when matching the header name (cherry picked from commit 4dca6d5d79ecea23a202727d1a9637dad15ef174) - URL: https://github.com/kamailio/kamailio/commit/c53c136622c378a59587486a23506e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:51:20+01:00 auth_radius: safety check for r variable (cherry picked from commit 1e5ea9beeb3055e0303eef992ffa87f61d8f0bf9) - URL: https://github.com/kamailio/kamailio/commit/924c7aa4b778c361b3b6245e71740d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:51:29+01:00 crypto: fixed safety check looking up var names (cherry picked from commit 98f35707fb00c8fa3512faff3b42a56a9e45e241) - URL: https://github.com/kamailio/kamailio/commit/01c6561c679ba338400a93e9648ad90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:51:37+01:00 http_client: fixed safety check looking up var names (cherry picked from commit 74215ac16878cc00cf29ae0fc89dfc9aa9ed9399) - URL: https://github.com/kamailio/kamailio/commit/b530e917009cf0babf0f535ec9e60c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:51:46+01:00 lcr: safety checks for parms of kemi functions (cherry picked from commit c0c374ef15a99eef745570dd78926f6248187493) - URL: https://github.com/kamailio/kamailio/commit/ef849f0dcb61f45b5c253f6102c403b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:51:54+01:00 peering: check return code when parsing all headers (cherry picked from commit 9e0fbfd9a79764fb283b6a6864e6519e167fff82) - URL: https://github.com/kamailio/kamailio/commit/4628c97ad0ef95fd2f11459eac99edf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:52:04+01:00 presence: increased the size of db update arrays in update_subs_db() (cherry picked from commit 816d2cd44d96245b5a5b53505d6fbc350bda378c) - URL: https://github.com/kamailio/kamailio/commit/e1cee88559ca075ef48afbffd11acc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:52:14+01:00 rabbitmq: proper test of pv cache lookup return (cherry picked from commit de4a32b02ddaf94b0ad4ed06a0b4fa5bb9c1a10e) - URL: https://github.com/kamailio/kamailio/commit/68055f304519addc05669e0820dd501… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:52:24+01:00 textopsx: proper check for null value inside ki_modify_hf() (cherry picked from commit 5d813bb3abd1a9a0ee080bf67db2f5502772a3be) - URL: https://github.com/kamailio/kamailio/commit/38ac5f15029a2f5f94f8065c0e37590… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T11:52:37+01:00 tm: restore backup char inside ki_t_check_status() (cherry picked from commit cae249d58c1155c2f13c56e8f1251fcadb5483c0) - URL: https://github.com/kamailio/kamailio/commit/1bd6a69ff894626f16c6ff678c817a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T12:20:20+01:00 core: kemi - removed redundant anchor operation (cherry picked from commit 7ed21aabfab384ae3ea8c2e683d62256cb3f0713) - URL: https://github.com/kamailio/kamailio/commit/f70d8d0833c0873166f5703890276f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T12:20:29+01:00 app_python: enabled rpc command to reload the script - reload command performs the mod_init and child_init operations - not tested yet (cherry picked from commit 22975d721b2ff573594575f5975fc9eff141b3e2)

1 0

git:master:22975d72: app_python: enabled rpc command to reload the script
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 22975d721b2ff573594575f5975fc9eff141b3e2 URL: https://github.com/kamailio/kamailio/commit/22975d721b2ff573594575f5975fc9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T12:18:11+01:00 app_python: enabled rpc command to reload the script - reload command performs the mod_init and child_init operations - not tested yet --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/apy_kemi.c Modified: src/modules/app_python/apy_kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/22975d721b2ff573594575f5975fc9e… Patch: https://github.com/kamailio/kamailio/commit/22975d721b2ff573594575f5975fc9e…

1 0

git:master:7ed21aab: core: kemi - removed redundant anchor operation
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 7ed21aabfab384ae3ea8c2e683d62256cb3f0713 URL: https://github.com/kamailio/kamailio/commit/7ed21aabfab384ae3ea8c2e683d6225… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T10:53:18+01:00 core: kemi - removed redundant anchor operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7ed21aabfab384ae3ea8c2e683d6225… Patch: https://github.com/kamailio/kamailio/commit/7ed21aabfab384ae3ea8c2e683d6225… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 3e83c9b498..55630c28f5 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1139,7 +1139,6 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) return -1; } memcpy(hdr, txt->s, txt->len); - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); } else { /* before hf */

1 0

git:5.0:4c8a2269: presence: extra columns updated for dbmode 2
by Luis Azedo 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.0 Commit: 4c8a2269a6aef6a6f7f3ab581fdfba4efe93fc6e URL: https://github.com/kamailio/kamailio/commit/4c8a2269a6aef6a6f7f3ab581fdfba4… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-12-08T09:08:03Z presence: extra columns updated for dbmode 2 we noticed some phones and upstream clusters sending diferent route / contact after initial subscription. this commit adds contact and record_route to updated columns for dbmode = 2 also adds user_agent to initial save and a simple fix for getting the correct message in debug (cherry picked from commit c0bc38616cb9a2923e35545fa86a663686bc6746) Conflicts: src/modules/presence/hash.c --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/4c8a2269a6aef6a6f7f3ab581fdfba4… Patch: https://github.com/kamailio/kamailio/commit/4c8a2269a6aef6a6f7f3ab581fdfba4…

1 0

git:5.1:d18ff638: presence: extra columns updated for dbmode 2
by Luis Azedo 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: d18ff6384d881f40db34dfce49b4584bc4faba2b URL: https://github.com/kamailio/kamailio/commit/d18ff6384d881f40db34dfce49b4584… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-12-08T09:00:58Z presence: extra columns updated for dbmode 2 we noticed some phones and upstream clusters sending diferent route / contact after initial subscription. this commit adds contact and record_route to updated columns for dbmode = 2 also adds user_agent to initial save and a simple fix for getting the correct message in debug (cherry picked from commit c0bc38616cb9a2923e35545fa86a663686bc6746) --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/d18ff6384d881f40db34dfce49b4584… Patch: https://github.com/kamailio/kamailio/commit/d18ff6384d881f40db34dfce49b4584…

1 0

Broken: kamailio/kamailio#5203 (master - c0bc386)
by Travis CI 08 Dec '17

08 Dec '17

Build Update for kamailio/kamailio ------------------------------------- Build: #5203 Status: Broken Duration: 5 minutes and 4 seconds Commit: c0bc386 (master) Author: lazedo Message: presence: extra columns updated for dbmode 2 we noticed some phones and upstream clusters sending diferent route / contact after initial subscription. this commit adds contact and record_route to updated columns for dbmode = 2 also adds user_agent to initial save and a simple fix for getting the correct message in debug View the changeset: https://github.com/kamailio/kamailio/compare/cae249d58c11...c0bc38616cb9 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/313382567?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Broken: kamailio/kamailio#5202 (master - cae249d)
by Travis CI 08 Dec '17

08 Dec '17

Build Update for kamailio/kamailio ------------------------------------- Build: #5202 Status: Broken Duration: 5 minutes and 37 seconds Commit: cae249d (master) Author: Daniel-Constantin Mierla Message: tm: restore backup char inside ki_t_check_status() View the changeset: https://github.com/kamailio/kamailio/compare/f4f2b7b201d1...cae249d58c11 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/313381536?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[kamailio/kamailio] presence: extra columns updated for dbmode 2 (#1354)
by lazedo 08 Dec '17

08 Dec '17

we noticed some phones and upstream clusters sending diferent route / contact after initial subscription. this commit adds contact and record_route to updated columns for dbmode = 2 also adds user_agent to initial save and a simple fix for getting the correct message in debug should be backported to stable/maintained to fix issue in existing deployments You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1354 -- Commit Summary -- * presence: extra columns updated for dbmode 2 -- File Changes -- M src/modules/presence/hash.c (26) M src/modules/presence/subscribe.c (30) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1354.patch https://github.com/kamailio/kamailio/pull/1354.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/1354

2 2

git:master:c0bc3861: presence: extra columns updated for dbmode 2
by lazedo 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: c0bc38616cb9a2923e35545fa86a663686bc6746 URL: https://github.com/kamailio/kamailio/commit/c0bc38616cb9a2923e35545fa86a663… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-12-08T08:50:44Z presence: extra columns updated for dbmode 2 we noticed some phones and upstream clusters sending diferent route / contact after initial subscription. this commit adds contact and record_route to updated columns for dbmode = 2 also adds user_agent to initial save and a simple fix for getting the correct message in debug --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/c0bc38616cb9a2923e35545fa86a663… Patch: https://github.com/kamailio/kamailio/commit/c0bc38616cb9a2923e35545fa86a663…

1 0

git:master:cae249d5: tm: restore backup char inside ki_t_check_status()
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: cae249d58c1155c2f13c56e8f1251fcadb5483c0 URL: https://github.com/kamailio/kamailio/commit/cae249d58c1155c2f13c56e8f1251fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:47:38+01:00 tm: restore backup char inside ki_t_check_status() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/cae249d58c1155c2f13c56e8f1251fc… Patch: https://github.com/kamailio/kamailio/commit/cae249d58c1155c2f13c56e8f1251fc… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 7d7145393b..90f9a989ea 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -995,6 +995,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) /* first get the transaction */ if (t_check(msg, 0 ) == -1) return -1; + backup = 0; if ((t = get_t()) == 0) { LM_ERR("cannot check status for a reply" " which has no T-state established\n"); @@ -1010,7 +1011,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) switch(get_route_type()) { case REQUEST_ROUTE: /* use the status of the last sent reply */ - status = int2str( t->uas.status, 0); + status = int2str(t->uas.status, 0); break; case TM_ONREPLY_ROUTE: @@ -1037,7 +1038,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) " a final response in FAILURE_ROUTE\n"); goto error; } - status = int2str( lowest_status , 0); + status = int2str(lowest_status, 0); break; case BRANCH_FAILURE_ROUTE: status = int2str(t->uac[get_t_branch()].last_received, 0); @@ -1052,6 +1053,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) /* do the checking */ n = regexec(&re, status, 1, &pmatch, 0); + if (backup) status[msg->first_line.u.reply.status.len] = backup; regfree(&re); if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ @@ -2979,4 +2981,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(tm_kemi_exports); return 0; -} \ No newline at end of file +}

1 0

[kamailio/kamailio] GeoIP2 not available into deb package (#1352)
by Surendra Tiwari 08 Dec '17

08 Dec '17

### Description I am trying to install geoip2 using apt-get but found its not available into debian repo. apt-get kamailio-geoip2-modules  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1352

3 2

git:master:f4f2b7b2: pkg/kamailio/deb: geoip2 module [skip ci]
by Victor Seva 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: f4f2b7b201d1cc5bbb0cc915835873a1e03270ac URL: https://github.com/kamailio/kamailio/commit/f4f2b7b201d1cc5bbb0cc915835873a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T09:46:29+01:00 pkg/kamailio/deb: geoip2 module [skip ci] fix #1352 --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/f4f2b7b201d1cc5bbb0cc915835873a… Patch: https://github.com/kamailio/kamailio/commit/f4f2b7b201d1cc5bbb0cc915835873a…

1 0

git:master:5d813bb3: textopsx: proper check for null value inside ki_modify_hf()
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 5d813bb3abd1a9a0ee080bf67db2f5502772a3be URL: https://github.com/kamailio/kamailio/commit/5d813bb3abd1a9a0ee080bf67db2f55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:31:21+01:00 textopsx: proper check for null value inside ki_modify_hf() --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/5d813bb3abd1a9a0ee080bf67db2f55… Patch: https://github.com/kamailio/kamailio/commit/5d813bb3abd1a9a0ee080bf67db2f55… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index a6d7abc65e..24bdf0c84f 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -1183,7 +1183,7 @@ static int ki_modify_hf(sip_msg_t *msg, str *hexp, str *val, p1 = NULL; goto error; } - if(val && val->s>=0) { + if(val && val->s!=0 && val->len>0) { s2 = as_asciiz(val); p2 = s2; if(fixf(&p2, 2)!=0) { @@ -1202,7 +1202,6 @@ static int ki_modify_hf(sip_msg_t *msg, str *hexp, str *val, return ret; error: - if(p2!=NULL) fixup_free_hname_str(&p2, 2); if(p1!=NULL) fixup_free_hname_str(&p1, 1); if(s2!=NULL) pkg_free(s2); if(s1!=NULL) pkg_free(s1);

1 0

git:master:de4a32b0: rabbitmq: proper test of pv cache lookup return
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: de4a32b02ddaf94b0ad4ed06a0b4fa5bb9c1a10e URL: https://github.com/kamailio/kamailio/commit/de4a32b02ddaf94b0ad4ed06a0b4fa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:27:11+01:00 rabbitmq: proper test of pv cache lookup return --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/de4a32b02ddaf94b0ad4ed06a0b4fa5… Patch: https://github.com/kamailio/kamailio/commit/de4a32b02ddaf94b0ad4ed06a0b4fa5… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 4e6e390d18..1e5ae7f351 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -507,7 +507,7 @@ static int ki_rabbitmq_publish_consume(sip_msg_t *msg, str *exchange, dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed getting pv: %.*s\n", dpv->len, dpv->s); return -1; } @@ -669,4 +669,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_rabbitmq_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:816d2cd4: presence: increased the size of db update arrays in update_subs_db()
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 816d2cd44d96245b5a5b53505d6fbc350bda378c URL: https://github.com/kamailio/kamailio/commit/816d2cd44d96245b5a5b53505d6fbc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:25:12+01:00 presence: increased the size of db update arrays in update_subs_db() --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/816d2cd44d96245b5a5b53505d6fbc3… Patch: https://github.com/kamailio/kamailio/commit/816d2cd44d96245b5a5b53505d6fbc3… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index f199f95c58..fb0fa719ad 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -372,8 +372,8 @@ int insert_subs_db(subs_t* s, int type) int update_subs_db(subs_t* subs, int type) { - db_key_t query_cols[3], update_keys[8]; - db_val_t query_vals[3], update_vals[8]; + db_key_t query_cols[3], update_keys[10]; + db_val_t query_vals[3], update_vals[10]; int n_update_cols= 0; int n_query_cols = 0;

1 0

git:master:c0c374ef: lcr: safety checks for parms of kemi functions
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: c0c374ef15a99eef745570dd78926f6248187493 URL: https://github.com/kamailio/kamailio/commit/c0c374ef15a99eef745570dd78926f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:20:02+01:00 lcr: safety checks for parms of kemi functions --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c0c374ef15a99eef745570dd78926f6… Patch: https://github.com/kamailio/kamailio/commit/c0c374ef15a99eef745570dd78926f6… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index eecab748f6..beeeec0e23 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2201,8 +2201,9 @@ static int ki_load_gws_furi(sip_msg_t *_m, int lcr_id, str *ruri_user, struct usr_avp *avp; struct search_state st; - LM_DBG("load_gws(%u, %.*s, %.*s)\n", lcr_id, ruri_user->len, ruri_user->s, - from_uri->len, from_uri->s); + LM_DBG("load_gws(%u, %.*s, %.*s)\n", lcr_id, + ruri_user->len, ZSW(ruri_user->s), + from_uri->len, ZSW(from_uri->s)); request_uri = GET_RURI(_m); @@ -2363,6 +2364,10 @@ static int ki_load_gws_ruser(sip_msg_t *_m, int lcr_id, str *ruri_user) { str from_uri = STR_NULL; + if(ruri_user==NULL || ruri_user->s==NULL) { + LM_ERR("invalid parameter\n"); + return -1; + } return ki_load_gws_furi(_m, lcr_id, ruri_user, &from_uri); } @@ -2371,9 +2376,15 @@ static int ki_load_gws_ruser(sip_msg_t *_m, int lcr_id, str *ruri_user) */ static int ki_load_gws(sip_msg_t *_m, int lcr_id) { - str ruri_user = STR_NULL; + str ruri_user; str from_uri = STR_NULL; + if ((parse_sip_msg_uri(_m) < 0) || (!_m->parsed_uri.user.s)) { + LM_ERR("error while parsing R-URI\n"); + return -1; + } + ruri_user = _m->parsed_uri.user; + return ki_load_gws_furi(_m, lcr_id, &ruri_user, &from_uri); } @@ -3444,4 +3455,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_lcr_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:9e0fbfd9: peering: check return code when parsing all headers
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 9e0fbfd9a79764fb283b6a6864e6519e167fff82 URL: https://github.com/kamailio/kamailio/commit/9e0fbfd9a79764fb283b6a6864e6519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:22:20+01:00 peering: check return code when parsing all headers --- Modified: src/modules/peering/verify.c --- Diff: https://github.com/kamailio/kamailio/commit/9e0fbfd9a79764fb283b6a6864e6519… Patch: https://github.com/kamailio/kamailio/commit/9e0fbfd9a79764fb283b6a6864e6519… --- diff --git a/src/modules/peering/verify.c b/src/modules/peering/verify.c index b3138c6fde..6865cf1b41 100644 --- a/src/modules/peering/verify.c +++ b/src/modules/peering/verify.c @@ -328,7 +328,10 @@ int verify_source(struct sip_msg* _msg, char* s1, char* s2) } /* Add P-Request-Hash header body */ - parse_headers(_msg, HDR_EOH_F, 0); + if(parse_headers(_msg, HDR_EOH_F, 0)<0) { + LM_ERR("failed to parse headers\n"); + return -1; + } for (hf = _msg->headers; hf; hf = hf->next) { if(cmp_hdrname_strzn(&hf->name, "P-Request-Hash", sizeof("P-Request-Hash") - 1) == 0)

1 0

git:master:74215ac1: http_client: fixed safety check looking up var names
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 74215ac16878cc00cf29ae0fc89dfc9aa9ed9399 URL: https://github.com/kamailio/kamailio/commit/74215ac16878cc00cf29ae0fc89dfc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:07:40+01:00 http_client: fixed safety check looking up var names --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/74215ac16878cc00cf29ae0fc89dfc9… Patch: https://github.com/kamailio/kamailio/commit/74215ac16878cc00cf29ae0fc89dfc9… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 4a19be6b18..9b8abc984d 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -561,7 +561,7 @@ static int ki_curl_connect(sip_msg_t *_m, str *con, str *url, str *dpv) pv_spec_t *dst; dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s); return -1; } @@ -635,7 +635,7 @@ static int ki_curl_connect_post(sip_msg_t *_m, str *con, str *url, pv_spec_t *dst; dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s); return -1; } @@ -810,7 +810,7 @@ static int ki_http_query_post_hdrs(sip_msg_t *_m, str *url, str *post, str *hdrs pv_spec_t *dst; dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s); return -1; }

1 0

git:master:98f35707: crypto: fixed safety check looking up var names
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 98f35707fb00c8fa3512faff3b42a56a9e45e241 URL: https://github.com/kamailio/kamailio/commit/98f35707fb00c8fa3512faff3b42a56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:04:35+01:00 crypto: fixed safety check looking up var names --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/98f35707fb00c8fa3512faff3b42a56… Patch: https://github.com/kamailio/kamailio/commit/98f35707fb00c8fa3512faff3b42a56… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 79345b7ae1..d3541ad03e 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -216,7 +216,7 @@ static int ki_crypto_aes_encrypt(sip_msg_t* msg, str *ins, str *keys, str *dpv) dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed getting pv: %.*s\n", dpv->len, dpv->s); return -1; } @@ -330,7 +330,7 @@ static int ki_crypto_aes_decrypt(sip_msg_t* msg, str *ins, str *keys, str *dpv) dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed getting pv: %.*s\n", dpv->len, dpv->s); return -1; }

1 0

git:master:4dca6d5d: core: kemi - break when matching the header name
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 4dca6d5d79ecea23a202727d1a9637dad15ef174 URL: https://github.com/kamailio/kamailio/commit/4dca6d5d79ecea23a202727d1a9637d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T08:58:20+01:00 core: kemi - break when matching the header name --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/4dca6d5d79ecea23a202727d1a9637d… Patch: https://github.com/kamailio/kamailio/commit/4dca6d5d79ecea23a202727d1a9637d… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index de07f058f2..3e83c9b498 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -938,6 +938,7 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) if (cmp_hdrname_str(&hf->name, &hfm.name)!=0) continue; } + break; } hdr = (char*)pkg_malloc(txt->len); @@ -1129,9 +1130,9 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) if (cmp_hdrname_str(&hf->name, &hfm.name)!=0) continue; } + break; } - hf = msg->headers; hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { LM_ERR("no pkg memory left\n");

1 0

git:master:1e5ea9be: auth_radius: safety check for r variable
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 1e5ea9beeb3055e0303eef992ffa87f61d8f0bf9 URL: https://github.com/kamailio/kamailio/commit/1e5ea9beeb3055e0303eef992ffa87f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:01:18+01:00 auth_radius: safety check for r variable --- Modified: src/modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/1e5ea9beeb3055e0303eef992ffa87f… Patch: https://github.com/kamailio/kamailio/commit/1e5ea9beeb3055e0303eef992ffa87f… --- diff --git a/src/modules/auth_radius/sterman.c b/src/modules/auth_radius/sterman.c index a8cf8f93cc..db50b39df6 100644 --- a/src/modules/auth_radius/sterman.c +++ b/src/modules/auth_radius/sterman.c @@ -93,7 +93,7 @@ static inline int extract_avp( name->s.len = p - vp->strvalue; name->s.s = vp->strvalue; value->n = strtol(++p, &r, 10); - } else if(p && p != r && !q) { + } else if(p && r && p != r && !q) { /* int name and int vale */ name->n = strtol(++p, &q, 10); value->n = strtol(++r, &q, 10);

1 0

git:master:2fe07249: core: pvapi - set prev variable when dropping from cache
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 2fe07249426b1ae9b368a1d1ffc7f2d5b881c704 URL: https://github.com/kamailio/kamailio/commit/2fe07249426b1ae9b368a1d1ffc7f2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T08:57:59+01:00 core: pvapi - set prev variable when dropping from cache --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe07249426b1ae9b368a1d1ffc7f2d… Patch: https://github.com/kamailio/kamailio/commit/2fe07249426b1ae9b368a1d1ffc7f2d… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 64b9fd96ff..dac770a0f3 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -289,6 +289,7 @@ int pv_cache_drop(void) pkg_free(pvi); return 1; } + pvp = pvi; pvi = pvi->next; } } @@ -310,6 +311,7 @@ int pv_cache_drop(void) pkg_free(pvi); return 1; } + pvp = pvi; pvi = pvi->next; } }

1 0

git:master:53c27ac3: app_mono: safety check beforing accessing field inside pointer
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 53c27ac3eb3e762110bd5cf54e55ddd85a7973a1 URL: https://github.com/kamailio/kamailio/commit/53c27ac3eb3e762110bd5cf54e55ddd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T08:57:17+01:00 app_mono: safety check beforing accessing field inside pointer - zero terminated allocated strings --- Modified: src/modules/app_mono/app_mono_api.c --- Diff: https://github.com/kamailio/kamailio/commit/53c27ac3eb3e762110bd5cf54e55ddd… Patch: https://github.com/kamailio/kamailio/commit/53c27ac3eb3e762110bd5cf54e55ddd… --- diff --git a/src/modules/app_mono/app_mono_api.c b/src/modules/app_mono/app_mono_api.c index 7bdfcb97a9..37ece204d2 100644 --- a/src/modules/app_mono/app_mono_api.c +++ b/src/modules/app_mono/app_mono_api.c @@ -136,7 +136,7 @@ int mono_sr_init_load(void) } mono_config_parse (NULL); mi = _sr_mono_load_list; - if(mi->domain != NULL) + if(mi && mi->domain != NULL) { LM_ERR("worker mono environment already initialized\n"); return 0; @@ -769,13 +769,14 @@ static int sr_mono_hdr_append (MonoString *hv) } hf = env_M->msg->last_header; - hdr = (char*)pkg_malloc(txt.len); + hdr = (char*)pkg_malloc(txt.len+1); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); goto error; } memcpy(hdr, txt.s, txt.len); + hdr[txt.len] = '\0'; anchor = anchor_lump(env_M->msg, hf->name.s + hf->len - env_M->msg->buf, 0, 0); if(insert_new_lump_before(anchor, hdr, txt.len, 0) == 0) @@ -863,13 +864,14 @@ static int sr_mono_hdr_insert (MonoString *hv) LM_DBG("insert hf: %s\n", txt.s); hf = env_M->msg->headers; - hdr = (char*)pkg_malloc(txt.len); + hdr = (char*)pkg_malloc(txt.len+1); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); goto error; } memcpy(hdr, txt.s, txt.len); + hdr[txt.len] = '\0'; anchor = anchor_lump(env_M->msg, hf->name.s + hf->len - env_M->msg->buf, 0, 0); if(insert_new_lump_before(anchor, hdr, txt.len, 0) == 0)

1 0

git:master:e30cbd00: kamctl: regenerate db creation scripts
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: e30cbd0010149a595ef7c11963a785ad784ea5c2 URL: https://github.com/kamailio/kamailio/commit/e30cbd0010149a595ef7c11963a785a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T08:42:00+01:00 kamctl: regenerate db creation scripts --- Modified: utils/kamctl/db_sqlite/topos-create.sql Modified: utils/kamctl/mysql/topos-create.sql Modified: utils/kamctl/oracle/topos-create.sql Modified: utils/kamctl/postgres/topos-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/e30cbd0010149a595ef7c11963a785a… Patch: https://github.com/kamailio/kamailio/commit/e30cbd0010149a595ef7c11963a785a… --- diff --git a/utils/kamctl/db_sqlite/topos-create.sql b/utils/kamctl/db_sqlite/topos-create.sql index d36c5b62ac..b39af68335 100644 --- a/utils/kamctl/db_sqlite/topos-create.sql +++ b/utils/kamctl/db_sqlite/topos-create.sql @@ -27,6 +27,8 @@ CREATE TABLE topos_d ( CREATE INDEX topos_d_rectime_idx ON topos_d (rectime); CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid); +CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid); +CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid); INSERT INTO version (table_name, table_version) values ('topos_d','1'); @@ -60,6 +62,8 @@ CREATE TABLE topos_t ( CREATE INDEX topos_t_rectime_idx ON topos_t (rectime); CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid); +CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch); +CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid); INSERT INTO version (table_name, table_version) values ('topos_t','1'); diff --git a/utils/kamctl/mysql/topos-create.sql b/utils/kamctl/mysql/topos-create.sql index db305752c6..1d35b2b83d 100644 --- a/utils/kamctl/mysql/topos-create.sql +++ b/utils/kamctl/mysql/topos-create.sql @@ -27,6 +27,8 @@ CREATE TABLE `topos_d` ( CREATE INDEX rectime_idx ON topos_d (`rectime`); CREATE INDEX a_callid_idx ON topos_d (`a_callid`); +CREATE INDEX a_uuid_idx ON topos_d (`a_uuid`); +CREATE INDEX b_uuid_idx ON topos_d (`b_uuid`); INSERT INTO version (table_name, table_version) values ('topos_d','1'); @@ -60,6 +62,8 @@ CREATE TABLE `topos_t` ( CREATE INDEX rectime_idx ON topos_t (`rectime`); CREATE INDEX a_callid_idx ON topos_t (`a_callid`); +CREATE INDEX x_vbranch_idx ON topos_t (`x_vbranch`); +CREATE INDEX a_uuid_idx ON topos_t (`a_uuid`); INSERT INTO version (table_name, table_version) values ('topos_t','1'); diff --git a/utils/kamctl/oracle/topos-create.sql b/utils/kamctl/oracle/topos-create.sql index b0f0aa47d5..f7dc8097ce 100644 --- a/utils/kamctl/oracle/topos-create.sql +++ b/utils/kamctl/oracle/topos-create.sql @@ -35,6 +35,8 @@ BEGIN map2users('topos_d'); END; / CREATE INDEX topos_d_rectime_idx ON topos_d (rectime); CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid); +CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid); +CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid); INSERT INTO version (table_name, table_version) values ('topos_d','1'); @@ -76,6 +78,8 @@ BEGIN map2users('topos_t'); END; / CREATE INDEX topos_t_rectime_idx ON topos_t (rectime); CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid); +CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch); +CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid); INSERT INTO version (table_name, table_version) values ('topos_t','1'); diff --git a/utils/kamctl/postgres/topos-create.sql b/utils/kamctl/postgres/topos-create.sql index d98dda3fad..a72be15622 100644 --- a/utils/kamctl/postgres/topos-create.sql +++ b/utils/kamctl/postgres/topos-create.sql @@ -27,6 +27,8 @@ CREATE TABLE topos_d ( CREATE INDEX topos_d_rectime_idx ON topos_d (rectime); CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid); +CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid); +CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid); INSERT INTO version (table_name, table_version) values ('topos_d','1'); @@ -60,6 +62,8 @@ CREATE TABLE topos_t ( CREATE INDEX topos_t_rectime_idx ON topos_t (rectime); CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid); +CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch); +CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid); INSERT INTO version (table_name, table_version) values ('topos_t','1');

1 0

git:master:66718c2a: schema: add indexes to topos Mysql tables (#13)
by GitHub 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 66718c2a77ae4cc427d8a06b4fa308224a5b3d48 URL: https://github.com/kamailio/kamailio/commit/66718c2a77ae4cc427d8a06b4fa3082… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-12-08T08:50:11+02:00 schema: add indexes to topos Mysql tables (#13) * topos: update topos_d.xml To optimize DB query speedup I propose to add few indexes. * topos: update topos_t.xml To optimize DB query speedup I propose to add few indexes. --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml --- Diff: https://github.com/kamailio/kamailio/commit/66718c2a77ae4cc427d8a06b4fa3082… Patch: https://github.com/kamailio/kamailio/commit/66718c2a77ae4cc427d8a06b4fa3082… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 85984faf9c..5b13333d62 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -225,4 +225,14 @@ <colref linkend="a_callid"/> </index> + <index> + <name>a_uuid_idx</name> + <colref linkend="a_uuid"/> + </index> + + <index> + <name>b_uuid_idx</name> + <colref linkend="b_uuid"/> + </index> + </table> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index 793fed4d1e..c6bc095aeb 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -232,4 +232,14 @@ <colref linkend="a_callid"/> </index> + <index> + <name>x_vbranch_idx</name> + <colref linkend="x_vbranch"/> + </index> + + <index> + <name>a_uuid_idx</name> + <colref linkend="a_uuid"/> + </index> + </table>

1 0

git:master:a4201bce: Merge pull request #1355 from sergey-vb/master
by GitHub 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: a4201bce416be015eae5534aaaa816f9926eacd4 URL: https://github.com/kamailio/kamailio/commit/a4201bce416be015eae5534aaaa816f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-12-08T08:17:49+01:00 Merge pull request #1355 from sergey-vb/master schema: add indexes to topos Mysql tables --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml --- Diff: https://github.com/kamailio/kamailio/commit/a4201bce416be015eae5534aaaa816f… Patch: https://github.com/kamailio/kamailio/commit/a4201bce416be015eae5534aaaa816f… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 85984faf9c..5b13333d62 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -225,4 +225,14 @@ <colref linkend="a_callid"/> </index> + <index> + <name>a_uuid_idx</name> + <colref linkend="a_uuid"/> + </index> + + <index> + <name>b_uuid_idx</name> + <colref linkend="b_uuid"/> + </index> + </table> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index 793fed4d1e..c6bc095aeb 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -232,4 +232,14 @@ <colref linkend="a_callid"/> </index> + <index> + <name>x_vbranch_idx</name> + <colref linkend="x_vbranch"/> + </index> + + <index> + <name>a_uuid_idx</name> + <colref linkend="a_uuid"/> + </index> + </table>

1 0

[kamailio/kamailio] schema: add indexes to topos Mysql tables (#1355)
by sergey-vb 08 Dec '17

08 Dec '17

#### 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 Using topos module in production I have found slow queries in MySQL. After analyzing it I have add indexes to topos_t and topos_d tables. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1355 -- Commit Summary -- * schema: add indexes to topos Mysql tables (#13) -- File Changes -- M src/lib/srdb1/schema/topos_d.xml (10) M src/lib/srdb1/schema/topos_t.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1355.patch https://github.com/kamailio/kamailio/pull/1355.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/1355

2 2

git:5.1:56a9993c: log_systemd: fixed typo in previous commit
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: 5.1 Commit: 56a9993c81123c4ee95ecc347aee28abbecb7e2a URL: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:25:40+01:00 log_systemd: fixed typo in previous commit (cherry picked from commit 41d66fa2293386bcc3765d6025c2f9b1bd89cd16) --- Modified: src/modules/log_systemd/log_systemd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… Patch: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… --- diff --git a/src/modules/log_systemd/log_systemd_mod.c b/src/modules/log_systemd/log_systemd_mod.c index eac379c0ab..d948b9a60b 100644 --- a/src/modules/log_systemd/log_systemd_mod.c +++ b/src/modules/log_systemd/log_systemd_mod.c @@ -106,7 +106,7 @@ static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt) /* one of LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, * LOG_NOTICE, LOG_INFO, LOG_DEBUG, as defined in syslog.h, see syslog(3) */ ilev = LOG_DEBUG; - if(slev->len==9 && strncasecmp(slev->1s, "LOG_EMERG", slev->len)==0) { + if(slev->len==9 && strncasecmp(slev->s, "LOG_EMERG", slev->len)==0) { ilev = LOG_EMERG; } else if(slev->len==9 && strncasecmp(slev->s, "LOG_ALERT", slev->len)==0) { ilev = LOG_ALERT;

1 0

git:master:41d66fa2: log_systemd: fixed typo in previous commit
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 41d66fa2293386bcc3765d6025c2f9b1bd89cd16 URL: https://github.com/kamailio/kamailio/commit/41d66fa2293386bcc3765d6025c2f9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:24:44+01:00 log_systemd: fixed typo in previous commit --- Modified: src/modules/log_systemd/log_systemd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/41d66fa2293386bcc3765d6025c2f9b… Patch: https://github.com/kamailio/kamailio/commit/41d66fa2293386bcc3765d6025c2f9b… --- diff --git a/src/modules/log_systemd/log_systemd_mod.c b/src/modules/log_systemd/log_systemd_mod.c index eac379c0ab..d948b9a60b 100644 --- a/src/modules/log_systemd/log_systemd_mod.c +++ b/src/modules/log_systemd/log_systemd_mod.c @@ -106,7 +106,7 @@ static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt) /* one of LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, * LOG_NOTICE, LOG_INFO, LOG_DEBUG, as defined in syslog.h, see syslog(3) */ ilev = LOG_DEBUG; - if(slev->len==9 && strncasecmp(slev->1s, "LOG_EMERG", slev->len)==0) { + if(slev->len==9 && strncasecmp(slev->s, "LOG_EMERG", slev->len)==0) { ilev = LOG_EMERG; } else if(slev->len==9 && strncasecmp(slev->s, "LOG_ALERT", slev->len)==0) { ilev = LOG_ALERT;

1 0

Broken: kamailio/kamailio#5196 (master - 73e9139)
by Travis CI 07 Dec '17

07 Dec '17

Build Update for kamailio/kamailio ------------------------------------- Build: #5196 Status: Broken Duration: 6 minutes and 20 seconds Commit: 73e9139 (master) Author: Daniel-Constantin Mierla Message: sca: exported functions to kemi framework View the changeset: https://github.com/kamailio/kamailio/compare/778a7a68618c...73e9139c5246 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/312974018?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

- URL: https://github.com/kamailio/kamailio/commit/81581e707df098a19be21316668b157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:16+01:00 acc_radius: functions exported to kemi framework (cherry picked from commit afbc1a7099eb59dcd8c11a202c9abb1bcf972751) - URL: https://github.com/kamailio/kamailio/commit/39b93755fa75bb9212397c300d48f61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:26+01:00 auth_radius: clang format the code (cherry picked from commit 1c07ddb50cf56ea9566effb8ff7ada3de8f1d48b) - URL: https://github.com/kamailio/kamailio/commit/63ef6271da5a8a1867e45756776e60a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:36+01:00 acc_radius: clang format the code (cherry picked from commit 7453fc5f8da8fed0941d5d8c759cec97e0647bfd) - URL: https://github.com/kamailio/kamailio/commit/444b2134fa252f409ae53b493e78ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:46+01:00 auth_radius: use core fixup helper functions (cherry picked from commit fe0c386cebebbf6c68b598269ecdfc25bfe1bcc2) - URL: https://github.com/kamailio/kamailio/commit/cdce438952ee97e91552e2d706db558… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:59+01:00 auth_radius: exported functions to kemi framework (cherry picked from commit cf043326abc792317335954fe75927f8294fa40e) - URL: https://github.com/kamailio/kamailio/commit/b833df0382d5194973134db477cb837… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:56:10+01:00 misc_radius: clang format the code (cherry picked from commit f283fe291917f67320061af3e35259859e448408) - URL: https://github.com/kamailio/kamailio/commit/96f30cbe88f9c6587894b18208cda87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:56:20+01:00 misc_radius: use spve fixup helper instead of pvar - simplifies getting params (cherry picked from commit f06e4d4b81e0df1009c3f2bbc54f0be1bb4a5d32) - URL: https://github.com/kamailio/kamailio/commit/90a116e77a39e8c25f3ae4c91021da6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:56:36+01:00 misc_radius: fixed accessing str* params after previous commit (cherry picked from commit 613350632c842c1775e1b5696b4cda4c96e5ba4c) - URL: https://github.com/kamailio/kamailio/commit/508328d51fc7c42a1bd5dc0a038aced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:56:47+01:00 misc_radius: exported functions to kemi framework (cherry picked from commit 95da4cda2c68ff25f7e14501a28cfe2ec0ebc50f) - URL: https://github.com/kamailio/kamailio/commit/ec9199a5e1993610e50ccc043fdee6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:00+01:00 nat_traversal: clang format the code (cherry picked from commit 3bad00732994813bc21c84d41342772783a5bddd) - URL: https://github.com/kamailio/kamailio/commit/066410bfb78eb9980d599aec76523a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:13+01:00 nat_traversal: exported functions to kemi framework (cherry picked from commit 04cfb0662be9cc429e66b79545daf578993dab1f) - URL: https://github.com/kamailio/kamailio/commit/b3ad080bb34eb3ec80043b3562b63b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:23+01:00 topos: update contact in branch record before sending response - might be updated in config execution - reported by GH #1339 (cherry picked from commit ebf570f83c878363dfd1f53882de9a0f907f5971) - URL: https://github.com/kamailio/kamailio/commit/855a13a938fcee7e05546a40c07a174… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:34+01:00 dmq: use core fixup helper functions directly (cherry picked from commit 727b5c5fed1e0972b80f005a801089a4afa2f114) - URL: https://github.com/kamailio/kamailio/commit/a9275cb5a1e5176b87e6c1f3e90c5b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:45+01:00 dmq: exported functions to kemi framework (cherry picked from commit 2b7ae0f01ae7f9ee9a9ccf12ef9ffad24a76764f) - URL: https://github.com/kamailio/kamailio/commit/09cc9abb57636bbf01b9128b1d79db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:57+01:00 crypto: exported functions to kemi interface (cherry picked from commit e7d1e96007683efcc193e0f6df16a1acb02be6b8) - URL: https://github.com/kamailio/kamailio/commit/7733c84fcc421b0408f0c6bd3ec1e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:58:28+01:00 http_client: clang format the code (cherry picked from commit 56a357a7cbd85e2ef69ab4508f26a1510cde16d6) - URL: https://github.com/kamailio/kamailio/commit/1c243828254b8f17a9834b502cb2a80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:58:38+01:00 http_client: exported functions to kemi framework (cherry picked from commit 8141ccaf6a0367cae57b6033e7720674c4eb889b) - URL: https://github.com/kamailio/kamailio/commit/a79c89807cb7e7c4a2d3756bc72bb9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:58:50+01:00 http_async_client: use route_lookup() instead of route_get() - avoids creating a useless route block structure (cherry picked from commit 1f8bc9fd5a4067b25994e87e27801d9df5cb5eb7) - URL: https://github.com/kamailio/kamailio/commit/ba1a1588e4f8249ecfdda2eb261d389… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:10+01:00 http_async_client: use directly the core fixup helper (cherry picked from commit ad68b65693936240a0101938de1bd466cb5e1bd0) - URL: https://github.com/kamailio/kamailio/commit/8804e7a18ddfaef4b6da584664e17bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:21+01:00 http_async_client: propagate route name to https async callback - lookup actions in target process, rather than in originating one (cherry picked from commit 2469b7963ac612e323478e172da4ab0e3a1773a9) - URL: https://github.com/kamailio/kamailio/commit/e6ef2547888b59370dda5c355df1319… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:32+01:00 tm: allow execution of t_continue with callback name - t_continue_cb() exported to tm api (cherry picked from commit 020f6b1ed77be268a981633cea8543cfc9521604) - URL: https://github.com/kamailio/kamailio/commit/859e4bea6df65de31e6836bc6ab5d73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:42+01:00 tmx: exported the rest of the functions to kemi framework (cherry picked from commit 08de83884bc40c5b426136c5dcb796e369c50027) - URL: https://github.com/kamailio/kamailio/commit/d83991d7daeea39f9e5900a1438e627… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:53+01:00 http_async_client: exported functions to kemi framework (cherry picked from commit b7d170607ccc1ecac6cb2bf210790c8382386f2a) - URL: https://github.com/kamailio/kamailio/commit/b9f172bb2b925c0eaf810b4eb597fd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:06+01:00 async: use t_continue_cb() for executing via kemi framework (cherry picked from commit 6bdf8119c1103b92e179144216bc19bbc8cdae0d) - URL: https://github.com/kamailio/kamailio/commit/fa6f5c35fa24fd1467ddd153ad0a056… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:18+01:00 ndb_mongodb: exported functions to kemi framework (cherry picked from commit 74208c2160ffb6200dd6a8982fd4d94a2c00d879) - URL: https://github.com/kamailio/kamailio/commit/7b158195c4617a55ce19b09a1e64f32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:31+01:00 mediaproxy: export functions to kemi framework (cherry picked from commit a04368528a3350a14038101a4bf17b4b742e362d) - URL: https://github.com/kamailio/kamailio/commit/2c75d2707d74966eddf2fe4b4338f56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:41+01:00 uri_db: functions exported to kemi framework (cherry picked from commit 2de661667ce0452a0095cd60d4913007045bb628) - URL: https://github.com/kamailio/kamailio/commit/2773c98604575c6472359eb360e5c97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:52+01:00 userblacklist: exported user check functions to kemi framework (cherry picked from commit 50c055a880f16cbb6c1a74b4ef82248bc3519f01) - URL: https://github.com/kamailio/kamailio/commit/a78a9d84d25862e0ca28909799f838a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:01:02+01:00 tm: t_check_status exported to kemi framework (cherry picked from commit 3de068a8897917d088993923f3028ca98aadc765) - URL: https://github.com/kamailio/kamailio/commit/aca608f2419498dbb3e805b572344b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:01:59+01:00 http_async_client: exported query function to kemi interface (cherry picked from commit f04c812b2af2d933e61b0d643bd245cc91c5f3eb) - URL: https://github.com/kamailio/kamailio/commit/31425aa48b8f19e52781b151341241b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:02:14+01:00 group: is_user_in() exported to kemi framework (cherry picked from commit 9139bd2991a28a6a1ef67692e76e71ba807913d8) - URL: https://github.com/kamailio/kamailio/commit/16ff4d966ce7e53716bbfb5e19e9a7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:02:27+01:00 benchmark: exported functions to kemi framework - new parameter 'register' - register a timer id, required when using kemi framework, because there is no fixup mechanism to register timer ids based on function params (cherry picked from commit f382c10e18248423c2f8f4fb3469f7faea1504e3) - URL: https://github.com/kamailio/kamailio/commit/0c5816740984eb94e66144a140de848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:02:37+01:00 benchmark: documentation for register parameter (cherry picked from commit 9c01580fd858f995dc8e680545f628f4716a77a4) - URL: https://github.com/kamailio/kamailio/commit/85cd536f8ea9e80c2b09addd6ecb6bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:02:52+01:00 uac_redirect: exported get_redirects() variants to kemi framework (cherry picked from commit 5a5bc72a66d2129aae8a8e200c905ff326e9f659) - URL: https://github.com/kamailio/kamailio/commit/0e0f8555457c53ef7925e7b721e9263… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:02+01:00 rabbitmq: clang format the code (cherry picked from commit 759e9d530c75e8c6c9d54764162cd17a8d8fe78e) - URL: https://github.com/kamailio/kamailio/commit/481a5cf29a0fafd987faa0d4a7a165f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:14+01:00 auth_ephemeral: variants of auth functions exported to kemi (cherry picked from commit 4861c7e831697bd0f139c87485c3dfb601a34599) - URL: https://github.com/kamailio/kamailio/commit/9b0bc6c17555aba525b53ce6f879b05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:24+01:00 rabbitmq: functions exported to kemi framework (cherry picked from commit 97b1fa994dfb5f463dd06b2f201423e19db5e508) - URL: https://github.com/kamailio/kamailio/commit/d01dfedd8361328c24acc350805fe43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:35+01:00 rls: exported functions to kemi framework (cherry picked from commit 90bd1b06f98cccff6419dcb1991fde686a37a34e) - URL: https://github.com/kamailio/kamailio/commit/592774ff1c326bb4f1fe3bca26adcd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:47+01:00 msilo: exported functions to kemi framework (cherry picked from commit 778a7a68618cb1d148b929bd80db4113a0ca0f46) - URL: https://github.com/kamailio/kamailio/commit/43df11808a1eef6a9db77efcf313712… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:07:10+01:00 counters: exported functions to kemi interface (cherry picked from commit 2c2ae33d639671fe3596df23aaee5087c7c70d86) - URL: https://github.com/kamailio/kamailio/commit/83df0d3348bcbb4ffbb48def0bd4cfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:07:19+01:00 log_systemd: exported functions to kemi framework (cherry picked from commit 6668999dfee8c77a1b8329eee38265b536386845) - URL: https://github.com/kamailio/kamailio/commit/cce6599d36f9a42baa2bc6e9d24a444… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:07:27+01:00 sca: get cfg int parameter in wrapper functions (cherry picked from commit 3ecd1958a5dfa8b21e67e52fc4f329dc58bffbf8) - URL: https://github.com/kamailio/kamailio/commit/46df53778bf30ca88b5b7c64b0d3e2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:07:39+01:00 sca: exported functions to kemi framework (cherry picked from commit 73e9139c5246d3882474d8c9c613105bcbc6d90a)

1 0

git:master:73e9139c: sca: exported functions to kemi framework
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 73e9139c5246d3882474d8c9c613105bcbc6d90a URL: https://github.com/kamailio/kamailio/commit/73e9139c5246d3882474d8c9c613105… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:05:54+01:00 sca: exported functions to kemi framework --- Modified: src/modules/sca/sca.c Modified: src/modules/sca/sca_subscribe.c Modified: src/modules/sca/sca_subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/73e9139c5246d3882474d8c9c613105… Patch: https://github.com/kamailio/kamailio/commit/73e9139c5246d3882474d8c9c613105… --- diff --git a/src/modules/sca/sca.c b/src/modules/sca/sca.c index f1dae14cb6..14dbf78ecb 100644 --- a/src/modules/sca/sca.c +++ b/src/modules/sca/sca.c @@ -41,6 +41,7 @@ #include "../../core/timer.h" #include "../../core/timer_proc.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" #include "sca.h" #include "sca_appearance.h" @@ -479,6 +480,19 @@ static int sca_call_info_update_3_f(sip_msg_t* msg, return sca_call_info_update(msg, update_mask, &uri_to, &uri_from); } +int ki_sca_call_info_update_default(sip_msg_t *msg) +{ + return sca_call_info_update(msg, SCA_CALL_INFO_SHARED_BOTH, NULL, NULL); +} +int ki_sca_call_info_update_mask(sip_msg_t *msg, int umask) +{ + return sca_call_info_update(msg, umask, NULL, NULL); +} +int ki_sca_call_info_update_turi(sip_msg_t *msg, int umask, str *sto) +{ + return sca_call_info_update(msg, umask, sto, NULL); +} + int fixup_ciu(void **param, int param_no) { switch (param_no) { @@ -504,3 +518,44 @@ int fixup_free_ciu(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_sca_exports[] = { + { str_init("sca"), str_init("handle_subscribe"), + SR_KEMIP_INT, ki_sca_handle_subscribe, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sca"), str_init("call_info_update_default"), + SR_KEMIP_INT, ki_sca_call_info_update_default, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sca"), str_init("call_info_update_mask"), + SR_KEMIP_INT, ki_sca_call_info_update_mask, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sca"), str_init("call_info_update_turi"), + SR_KEMIP_INT, ki_sca_call_info_update_turi, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sca"), str_init("call_info_update"), + SR_KEMIP_INT, sca_call_info_update, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_sca_exports); + return 0; +} \ No newline at end of file diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 48b0d58870..8040d49aab 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1135,7 +1135,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, return (-1); } -int sca_handle_subscribe(sip_msg_t *msg, char *p1, char *p2) +int ki_sca_handle_subscribe(sip_msg_t *msg) { sca_subscription req_sub; sca_subscription *sub = NULL; @@ -1354,6 +1354,11 @@ int sca_handle_subscribe(sip_msg_t *msg, char *p1, char *p2) return (rc); } +int sca_handle_subscribe(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_sca_handle_subscribe(msg); +} + int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, int event_type, int expires, sip_msg_t *msg) { diff --git a/src/modules/sca/sca_subscribe.h b/src/modules/sca/sca_subscribe.h index 2ef56d53da..e91971756e 100644 --- a/src/modules/sca/sca_subscribe.h +++ b/src/modules/sca/sca_subscribe.h @@ -88,5 +88,6 @@ void sca_subscription_state_to_str(int, str *); int sca_subscription_aor_has_subscribers(int, str *); int sca_subscription_delete_subscriber_for_event(sca_mod *, str *, str *, str *); int sca_subscription_terminate(sca_mod *, str *, int, str *, int, int); +int ki_sca_handle_subscribe(sip_msg_t *msg); #endif // SCA_SUBSCRIBE_H

1 0

git:master:3ecd1958: sca: get cfg int parameter in wrapper functions
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 3ecd1958a5dfa8b21e67e52fc4f329dc58bffbf8 URL: https://github.com/kamailio/kamailio/commit/3ecd1958a5dfa8b21e67e52fc4f329d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:44:00+01:00 sca: get cfg int parameter in wrapper functions --- Modified: src/modules/sca/sca.c Modified: src/modules/sca/sca_call_info.c Modified: src/modules/sca/sca_call_info.h --- Diff: https://github.com/kamailio/kamailio/commit/3ecd1958a5dfa8b21e67e52fc4f329d… Patch: https://github.com/kamailio/kamailio/commit/3ecd1958a5dfa8b21e67e52fc4f329d…

1 0

git:master:2c2ae33d: counters: exported functions to kemi interface
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 2c2ae33d639671fe3596df23aaee5087c7c70d86 URL: https://github.com/kamailio/kamailio/commit/2c2ae33d639671fe3596df23aaee508… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:19:57+01:00 counters: exported functions to kemi interface --- Modified: src/modules/counters/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/2c2ae33d639671fe3596df23aaee508… Patch: https://github.com/kamailio/kamailio/commit/2c2ae33d639671fe3596df23aaee508… --- diff --git a/src/modules/counters/counters.c b/src/modules/counters/counters.c index 20410092a1..29bce00743 100644 --- a/src/modules/counters/counters.c +++ b/src/modules/counters/counters.c @@ -31,6 +31,7 @@ #include "../../core/dprint.h" #include "../../core/compiler_opt.h" #include "../../core/counters.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -238,7 +239,9 @@ static int cnt_int_fixup(void** param, int param_no) } - +/** + * + */ static int cnt_inc_f(struct sip_msg* msg, char* handle, char* bar) { counter_handle_t h; @@ -248,8 +251,39 @@ static int cnt_inc_f(struct sip_msg* msg, char* handle, char* bar) return 1; } +#define cnt_op_handle_get() \ + do { \ + name = sname->s; \ + grp = cnt_script_grp; /* default group */ \ + if ((p = strchr(name, '.')) != 0) { \ + /* found group */ \ + grp = name; \ + name = p+1; \ + *p = 0; \ + } \ + if (counter_lookup(&h, grp, name) < 0) { \ + ERR("counter %s.%s does not exist (forgot to define it?)\n", \ + grp, name); \ + return -1; \ + } \ + } while(0) + +static int ki_cnt_inc(sip_msg_t* msg, str *sname) +{ + char* name; + char* grp; + char* p; + counter_handle_t h; + + cnt_op_handle_get(); + counter_inc(h); + return 1; +} +/** + * + */ static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) { counter_handle_t h; @@ -264,8 +298,22 @@ static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) return 1; } +static int ki_cnt_add(sip_msg_t* msg, str *sname, int v) +{ + char* name; + char* grp; + char* p; + counter_handle_t h; + + cnt_op_handle_get(); + counter_add(h, v); + return 1; +} +/** + * + */ static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) { counter_handle_t h; @@ -276,6 +324,19 @@ static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) } +static int ki_cnt_reset(sip_msg_t* msg, str *sname) +{ + char* name; + char* grp; + char* p; + counter_handle_t h; + + cnt_op_handle_get(); + + counter_reset(h); + return 1; +} + static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group); @@ -461,4 +522,35 @@ static void cnt_help_rpc(rpc_t* rpc, void* ctx) return; } -/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_counters_exports[] = { + { str_init("counters"), str_init("inc"), + SR_KEMIP_INT, ki_cnt_inc, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("counters"), str_init("add"), + SR_KEMIP_INT, ki_cnt_add, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("counters"), str_init("reset"), + SR_KEMIP_INT, ki_cnt_reset, + { SR_KEMIP_STR, 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 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_counters_exports); + return 0; +} + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ \ No newline at end of file

1 0

git:master:6668999d: log_systemd: exported functions to kemi framework
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 6668999dfee8c77a1b8329eee38265b536386845 URL: https://github.com/kamailio/kamailio/commit/6668999dfee8c77a1b8329eee38265b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:43:11+01:00 log_systemd: exported functions to kemi framework --- Modified: src/modules/log_systemd/log_systemd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6668999dfee8c77a1b8329eee38265b… Patch: https://github.com/kamailio/kamailio/commit/6668999dfee8c77a1b8329eee38265b…

1 0

[kamailio/kamailio] topos: BYE befor 200 OK creates new connection (#1339)
by sergey-vb 07 Dec '17

07 Dec '17

### Description If call has ended with BYE after 180/183 before 200 OK, kamailio tries to create new connection to destination, not to use existing. With firewall enabled and TLS transport this is issue. ### Troubleshooting #### Reproduction Load topos module, register client (asterisk, it shows port 5061 in contact but real query comes from random tcp port) using TLS, make call to it, terminate call with BYE, before answering. #### Log Messages [kamailio-topos.gz](https://github.com/kamailio/kamailio/files/1505189/kamai… #### SIP Traffic [topos-by-befor-ack.tar.gz](https://github.com/kamailio/kamailio/files/15051… ### Additional Information version: kamailio 5.2.0-dev1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 09:24:06 Nov 27 2017 with gcc 4.8.5 * **Operating System**: Red Hat Enterprise Linux Server 7.3 3.10.0-514.el7.x86_64 #1 SMP Wed Oct 19 11:24:13 EDT 2016 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/1339

2 6

git:master:778a7a68: msilo: exported functions to kemi framework
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 778a7a68618cb1d148b929bd80db4113a0ca0f46 URL: https://github.com/kamailio/kamailio/commit/778a7a68618cb1d148b929bd80db411… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T10:52:15+01:00 msilo: exported functions to kemi framework --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/778a7a68618cb1d148b929bd80db411… Patch: https://github.com/kamailio/kamailio/commit/778a7a68618cb1d148b929bd80db411… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index f62557ce2a..2f261d69bd 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -44,6 +44,7 @@ #include "../../core/resolve.h" #include "../../core/usr_avp.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" @@ -923,6 +924,14 @@ static int m_store_2(struct sip_msg* msg, char* owner, char* s2) return m_store(msg, NULL); } +/** + * store message + */ +static int ki_m_store(sip_msg_t* msg) +{ + return m_store(msg, NULL); +} + /** * dump message */ @@ -1182,6 +1191,14 @@ static int m_dump_2(struct sip_msg* msg, char* owner, char* s2) return m_dump(msg, NULL); } +/** + * dump message + */ +static int ki_m_dump(sip_msg_t* msg) +{ + return m_dump(msg, NULL); +} + /** * - cleaning up the messages that got reply * - delete expired messages from database @@ -1601,3 +1618,38 @@ int check_message_support(struct sip_msg* msg) return -1; } +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_msilo_exports[] = { + { str_init("msilo"), str_init("mstore"), + SR_KEMIP_INT, ki_m_store, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("msilo"), str_init("mstore_uri"), + SR_KEMIP_INT, m_store, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("msilo"), str_init("mdump"), + SR_KEMIP_INT, ki_m_dump, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("msilo"), str_init("mdump_uri"), + SR_KEMIP_INT, m_dump, + { SR_KEMIP_STR, 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 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_msilo_exports); + return 0; +} \ No newline at end of file

1 0

git:master:90bd1b06: rls: exported functions to kemi framework
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 90bd1b06f98cccff6419dcb1991fde686a37a34e URL: https://github.com/kamailio/kamailio/commit/90bd1b06f98cccff6419dcb1991fde6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T10:05:47+01:00 rls: exported functions to kemi framework --- Modified: src/modules/rls/resource_notify.c Modified: src/modules/rls/resource_notify.h Modified: src/modules/rls/rls.c Modified: src/modules/rls/subscribe.c Modified: src/modules/rls/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/90bd1b06f98cccff6419dcb1991fde6… Patch: https://github.com/kamailio/kamailio/commit/90bd1b06f98cccff6419dcb1991fde6…

1 0

git:master:97b1fa99: rabbitmq: functions exported to kemi framework
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 97b1fa994dfb5f463dd06b2f201423e19db5e508 URL: https://github.com/kamailio/kamailio/commit/97b1fa994dfb5f463dd06b2f201423e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T08:35:23+01:00 rabbitmq: functions exported to kemi framework --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/97b1fa994dfb5f463dd06b2f201423e… Patch: https://github.com/kamailio/kamailio/commit/97b1fa994dfb5f463dd06b2f201423e…

1 0

git:master:4861c7e8: auth_ephemeral: variants of auth functions exported to kemi
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 4861c7e831697bd0f139c87485c3dfb601a34599 URL: https://github.com/kamailio/kamailio/commit/4861c7e831697bd0f139c87485c3dfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T08:34:55+01:00 auth_ephemeral: variants of auth functions exported to kemi --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/authorize.c Modified: src/modules/auth_ephemeral/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/4861c7e831697bd0f139c87485c3dfb… Patch: https://github.com/kamailio/kamailio/commit/4861c7e831697bd0f139c87485c3dfb…

1 0

git:master:759e9d53: rabbitmq: clang format the code
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 759e9d530c75e8c6c9d54764162cd17a8d8fe78e URL: https://github.com/kamailio/kamailio/commit/759e9d530c75e8c6c9d54764162cd17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T21:16:35+01:00 rabbitmq: clang format the code --- Modified: src/modules/rabbitmq/rabbitmq.c Modified: src/modules/rabbitmq/rabbitmq.h Modified: src/modules/rabbitmq/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/759e9d530c75e8c6c9d54764162cd17… Patch: https://github.com/kamailio/kamailio/commit/759e9d530c75e8c6c9d54764162cd17…

1 0

Doing a quick test with http_async_client module from master branch
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Hello, anyone around here that can do a quick test with http_async_module? I don't have a testbed for it right now and I would spend the time on other resources if someone here can run some tests with http_async_client module from master branch. I did a bit of internal refactoring in order to be able to export the function to kemi interface -- nothing radical, but it would be good to know it didn't break anything. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

2 3

git:master:5a5bc72a: uac_redirect: exported get_redirects() variants to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 5a5bc72a66d2129aae8a8e200c905ff326e9f659 URL: https://github.com/kamailio/kamailio/commit/5a5bc72a66d2129aae8a8e200c905ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T21:11:44+01:00 uac_redirect: exported get_redirects() variants to kemi framework --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5bc72a66d2129aae8a8e200c905ff… Patch: https://github.com/kamailio/kamailio/commit/5a5bc72a66d2129aae8a8e200c905ff… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 77da46672e..788829ae6d 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -28,6 +28,7 @@ #include "../../core/mem/mem.h" #include "../../lib/srutils/sruid.h" #include "../../modules/tm/tm_load.h" +#include "../../core/kemi.h" #include "rd_funcs.h" #include "rd_filter.h" @@ -258,6 +259,7 @@ static int redirect_init(void) { regex_t *filter; void *p; + cmd_function fct; /* load the TM API */ if (load_tm_api(&rd_tmb)!=0) { @@ -304,6 +306,21 @@ static int redirect_init(void) if(sruid_init(&_redirect_sruid, '-', "rdir", SRUID_INC)<0) return -1; + if(rd_acc_fct == 0) { + /* import the acc stuff */ + if(acc_fct_s != 0 && acc_fct_s[0] == '\0') { + fct = find_export(acc_fct_s, 2, REQUEST_ROUTE); + if(fct == 0) + fct = find_export(acc_fct_s, 1, REQUEST_ROUTE); + if(fct == 0) { + LM_ERR("cannot import %s function; is acc loaded and" + " configured\n", acc_fct_s); + return E_UNSPEC; + } + rd_acc_fct = fct; + } + } + return 0; error: return -1; @@ -374,3 +391,83 @@ static int w_get_redirect1(struct sip_msg* msg, char *max_c, char *foo) return w_get_redirect2(msg, max_c, 0); } +static int ki_get_redirects_acc(sip_msg_t* msg, int max_c, int max_b, + str *reason) +{ + int n; + acc_param_t accp; + + if(reason && reason->len>0) { + memset(&accp, 0, sizeof(acc_param_t)); + accp.reason.s = reason->s; + accp.reason.len = reason->len; + } + msg_tracer(msg, 0); + /* get the contacts */ + n = get_redirect(msg, max_c, max_b, (reason && reason->len>0)?&accp:NULL, + bflags); + reset_filters(); + /* reset the tracer */ + msg_tracer(msg, 1); + + return n; +} + +static int ki_get_redirects(sip_msg_t* msg, int max_c, int max_b) +{ + int n; + + msg_tracer(msg, 0); + /* get the contacts */ + n = get_redirect(msg, max_c, max_b, NULL, bflags); + reset_filters(); + /* reset the tracer */ + msg_tracer(msg, 1); + + return n; +} + +static int ki_get_redirects_all(sip_msg_t* msg) +{ + int n; + + msg_tracer(msg, 0); + /* get the contacts */ + n = get_redirect(msg, 0, 0, NULL, bflags); + reset_filters(); + /* reset the tracer */ + msg_tracer(msg, 1); + + return n; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_uac_redirect_exports[] = { + { str_init("uac_redirect"), str_init("get_redirects_all"), + SR_KEMIP_INT, ki_get_redirects_all, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("uac_redirect"), str_init("get_redirects"), + SR_KEMIP_INT, ki_get_redirects, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("uac_redirect"), str_init("get_redirects_acc"), + SR_KEMIP_INT, ki_get_redirects_acc, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_uac_redirect_exports); + return 0; +} \ No newline at end of file

1 0

git:master:0b31d427: modules: readme files regenerated - benchmark ... [skip ci]
by Kamailio Dev 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 0b31d42751994a71286d028df4c32e41549a40f4 URL: https://github.com/kamailio/kamailio/commit/0b31d42751994a71286d028df4c32e4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-12-06T20:16:24+01:00 modules: readme files regenerated - benchmark ... [skip ci] --- Modified: src/modules/benchmark/README --- Diff: https://github.com/kamailio/kamailio/commit/0b31d42751994a71286d028df4c32e4… Patch: https://github.com/kamailio/kamailio/commit/0b31d42751994a71286d028df4c32e4… --- diff --git a/src/modules/benchmark/README b/src/modules/benchmark/README index 6f38bcdbff..30ac60e6d8 100644 --- a/src/modules/benchmark/README +++ b/src/modules/benchmark/README @@ -35,6 +35,7 @@ Bastian Friedrich 3.1. enable (int) 3.2. granularity (int) 3.3. loglevel (int) + 3.4. register (str) 4. Functions @@ -69,10 +70,11 @@ Bastian Friedrich 1.1. Set enable parameter 1.2. Set granularity parameter 1.3. Set loglevel parameter - 1.4. bm_start_timer usage - 1.5. bm_log_timer usage - 1.6. Enabling a timer - 1.7. benchmark usage + 1.4. Set register parameter + 1.5. bm_start_timer usage + 1.6. bm_log_timer usage + 1.7. Enabling a timer + 1.8. benchmark usage 2.1. Using the benchmark module's API from another module Chapter 1. Admin Guide @@ -90,6 +92,7 @@ Chapter 1. Admin Guide 3.1. enable (int) 3.2. granularity (int) 3.3. loglevel (int) + 3.4. register (str) 4. Functions @@ -140,6 +143,7 @@ Chapter 1. Admin Guide 3.1. enable (int) 3.2. granularity (int) 3.3. loglevel (int) + 3.4. register (str) 3.1. enable (int) @@ -193,6 +197,20 @@ modparam("benchmark", "loglevel", 4) This will set the logging level to L_DBG. +3.4. register (str) + + Register a timer id at startup. Required when using the start/log + functions via Kemi framework. This parameter can be set many times to + register several timer ids. + + Default value is “NONE”. + + Example 1.4. Set register parameter +... +modparam("benchmark", "register", "test") +modparam("benchmark", "register", "auth") +... + 4. Functions 4.1. bm_start_timer(name) @@ -202,7 +220,7 @@ modparam("benchmark", "loglevel", 4) Start timer “name”. A later call to “bm_log_timer()” logs this timer.. - Example 1.4. bm_start_timer usage + Example 1.5. bm_start_timer usage ... bm_start_timer("test"); ... @@ -235,7 +253,7 @@ bm_start_timer("test"); * Global avg possibly the most interesting value. - Example 1.5. bm_log_timer usage + Example 1.6. bm_log_timer usage ... bm_log_timer("test"); ... @@ -269,7 +287,7 @@ bm_log_timer("test"); Enable or disable a single timer. The following example enables timer "test" (the second parameter must be 0 to disable): - Example 1.6. Enabling a timer + Example 1.7. Enabling a timer ... kamcmd benchmark.enable_timer test 1 ... @@ -286,7 +304,7 @@ kamcmd benchmark.enable_timer test 1 Measure the duration of user location lookup. - Example 1.7. benchmark usage + Example 1.8. benchmark usage ... bm_start_timer("usrloc-lookup"); lookup("location");

1 0

git:master:9c01580f: benchmark: documentation for register parameter
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 9c01580fd858f995dc8e680545f628f4716a77a4 URL: https://github.com/kamailio/kamailio/commit/9c01580fd858f995dc8e680545f628f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T20:00:50+01:00 benchmark: documentation for register parameter --- Modified: src/modules/benchmark/doc/benchmark_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c01580fd858f995dc8e680545f628f… Patch: https://github.com/kamailio/kamailio/commit/9c01580fd858f995dc8e680545f628f… --- diff --git a/src/modules/benchmark/doc/benchmark_admin.xml b/src/modules/benchmark/doc/benchmark_admin.xml index e666d105d2..2216dc219b 100644 --- a/src/modules/benchmark/doc/benchmark_admin.xml +++ b/src/modules/benchmark/doc/benchmark_admin.xml @@ -156,6 +156,29 @@ modparam("benchmark", "loglevel", 4) </para> </section> + <section id="benchmark.p.register"> + <title><varname>register</varname> (str)</title> + <para> + Register a timer id at startup. Required when using the start/log + functions via Kemi framework. This parameter can be set many + times to register several timer ids. + </para> + <para> + <emphasis> + Default value is <quote>NONE</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>register</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("benchmark", "register", "test") +modparam("benchmark", "register", "auth") +... +</programlisting> + </example> + </section> + </section> <section> <title>Functions</title>

1 0

git:master:f382c10e: benchmark: exported functions to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: f382c10e18248423c2f8f4fb3469f7faea1504e3 URL: https://github.com/kamailio/kamailio/commit/f382c10e18248423c2f8f4fb3469f7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T19:56:32+01:00 benchmark: exported functions to kemi framework - new parameter 'register' - register a timer id, required when using kemi framework, because there is no fixup mechanism to register timer ids based on function params --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/f382c10e18248423c2f8f4fb3469f7f… Patch: https://github.com/kamailio/kamailio/commit/f382c10e18248423c2f8f4fb3469f7f…

1 0

git:master:9139bd29: group: is_user_in() exported to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 9139bd2991a28a6a1ef67692e76e71ba807913d8 URL: https://github.com/kamailio/kamailio/commit/9139bd2991a28a6a1ef67692e76e71b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T18:14:49+01:00 group: is_user_in() exported to kemi framework --- Modified: src/modules/group/group.c Modified: src/modules/group/group.h Modified: src/modules/group/group_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9139bd2991a28a6a1ef67692e76e71b… Patch: https://github.com/kamailio/kamailio/commit/9139bd2991a28a6a1ef67692e76e71b…

1 0

git:5.0:6d58c71a: tm: make t_run_local_req reentrant
by Federico Cabiddu 06 Dec '17

06 Dec '17

Module: kamailio Branch: 5.0 Commit: 6d58c71aa9c5e0a4571a5f12db724b753b035ece URL: https://github.com/kamailio/kamailio/commit/6d58c71aa9c5e0a4571a5f12db724b7… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-12-06T17:27:05+01:00 tm: make t_run_local_req reentrant - avoid crash when local-request event route is triggered inside another one (cherry picked from commit 97b15611ad87e36dd17ba76a77cb8817d974806b) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/6d58c71aa9c5e0a4571a5f12db724b7… Patch: https://github.com/kamailio/kamailio/commit/6d58c71aa9c5e0a4571a5f12db724b7… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 5352e25399..e73af4eb03 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -221,7 +221,7 @@ static inline int t_run_local_req( uac_req_t *uac_r, struct cell *new_cell, struct retr_buf *request) { - static struct sip_msg lreq; + struct sip_msg lreq = {0}; struct onsend_info onsnd_info; tm_xlinks_t backup_xd; int sflag_bk;

1 0

git:5.1:0a327ed6: tm: make t_run_local_req reentrant
by Federico Cabiddu 06 Dec '17

06 Dec '17

Module: kamailio Branch: 5.1 Commit: 0a327ed62b47bd56b7b7463c2552d2c66397e897 URL: https://github.com/kamailio/kamailio/commit/0a327ed62b47bd56b7b7463c2552d2c… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-12-06T17:26:45+01:00 tm: make t_run_local_req reentrant - avoid crash when local-request event route is triggered inside another one (cherry picked from commit 97b15611ad87e36dd17ba76a77cb8817d974806b) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/0a327ed62b47bd56b7b7463c2552d2c… Patch: https://github.com/kamailio/kamailio/commit/0a327ed62b47bd56b7b7463c2552d2c… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index dddeb0aa34..7b78a609b3 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -221,7 +221,7 @@ static inline int t_run_local_req( uac_req_t *uac_r, struct cell *new_cell, struct retr_buf *request) { - static struct sip_msg lreq; + struct sip_msg lreq = {0}; struct onsend_info onsnd_info; tm_xlinks_t backup_xd; int sflag_bk;

1 0

[kamailio/kamailio] tm: make t_run_local_req reentrant (#1348)
by Federico Cabiddu 06 Dec '17

06 Dec '17

- avoid crash when local-request event route is triggered inside another one Nested calls to tm:local-routes generate a crash. I've been recently experiencing this with the following scenario: - event_route[tm:local-request] defined - dialog module's send_bye param set to 1 - htable module's enable_dmq param set to 1 When a dialog reaches the timeout, the BYE generated by dialog module triggers the tm:local-request event route. One of the operations done in my scenario is an htable decrement on a table for which dmq replication is enabled. This trigger again the tm event route (because dmq is using tm uac). When the execution of the 2nd route ends the first one is continued, but the sip_msg structure is at this point corrupted because is declared static in t_run_local_req. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1348 -- Commit Summary -- * tm: make t_run_local_req reentrant -- File Changes -- M src/modules/tm/uac.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1348.patch https://github.com/kamailio/kamailio/pull/1348.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/1348

2 4

git:master:432b38bb: Merge pull request #1348 from grumvalski/local_request_crash
by GitHub 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 432b38bb0b50b683360743cfbb013e4865c426e4 URL: https://github.com/kamailio/kamailio/commit/432b38bb0b50b683360743cfbb013e4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-12-06T17:18:47+01:00 Merge pull request #1348 from grumvalski/local_request_crash tm: make t_run_local_req reentrant --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/432b38bb0b50b683360743cfbb013e4… Patch: https://github.com/kamailio/kamailio/commit/432b38bb0b50b683360743cfbb013e4… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index dddeb0aa34..7b78a609b3 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -221,7 +221,7 @@ static inline int t_run_local_req( uac_req_t *uac_r, struct cell *new_cell, struct retr_buf *request) { - static struct sip_msg lreq; + struct sip_msg lreq = {0}; struct onsend_info onsnd_info; tm_xlinks_t backup_xd; int sflag_bk;

1 0

git:master:97b15611: tm: make t_run_local_req reentrant
by grumvalski 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 97b15611ad87e36dd17ba76a77cb8817d974806b URL: https://github.com/kamailio/kamailio/commit/97b15611ad87e36dd17ba76a77cb881… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-11-30T15:06:27+01:00 tm: make t_run_local_req reentrant - avoid crash when local-request event route is triggered inside another one --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/97b15611ad87e36dd17ba76a77cb881… Patch: https://github.com/kamailio/kamailio/commit/97b15611ad87e36dd17ba76a77cb881… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index dddeb0aa34..7b78a609b3 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -221,7 +221,7 @@ static inline int t_run_local_req( uac_req_t *uac_r, struct cell *new_cell, struct retr_buf *request) { - static struct sip_msg lreq; + struct sip_msg lreq = {0}; struct onsend_info onsnd_info; tm_xlinks_t backup_xd; int sflag_bk;

1 0

git:master:f04c812b: http_async_client: exported query function to kemi interface
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: f04c812b2af2d933e61b0d643bd245cc91c5f3eb URL: https://github.com/kamailio/kamailio/commit/f04c812b2af2d933e61b0d643bd245c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T17:00:41+01:00 http_async_client: exported query function to kemi interface --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f04c812b2af2d933e61b0d643bd245c… Patch: https://github.com/kamailio/kamailio/commit/f04c812b2af2d933e61b0d643bd245c… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 3ec52f4f3b..1799a05fb6 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -50,6 +50,7 @@ #include "../../core/pvar.h" #include "../../core/cfg/cfg_struct.h" #include "../../core/fmsg.h" +#include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" @@ -207,19 +208,6 @@ struct module_exports exports = { }; -int mod_register(char *path, int *dlflags, void *p1, void *p2) -{ - pv_register_api_t pvra; - - pvra = (pv_register_api_t)find_export("pv_register_api", NO_SCRIPT, 0); - if (!pvra) { - LM_ERR("Cannot import pv functions (pv module must be loaded before this module)\n"); - return -1; - } - pvra(&pv_api); - return 0; -} - /** * init module function */ @@ -407,7 +395,24 @@ static int w_http_async_query(sip_msg_t *msg, char *query, char* rt) return -1; } return async_send_query(msg, &sdata, &rn); +} +/** + * + */ +static int ki_http_async_query(sip_msg_t *msg, str *sdata, str *rn) +{ + if(msg==NULL) + return -1; + if(sdata==NULL || sdata->len <= 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + if(rn->s==NULL || rn->len <= 0) { + LM_ERR("invalid route name parameter\n"); + return -1; + } + return async_send_query(msg, sdata, rn); } #define _IVALUE_ERROR(NAME) LM_ERR("invalid parameter '" #NAME "' (must be a number)\n") @@ -724,3 +729,32 @@ static int ah_set_req(struct sip_msg* msg, pv_param_t *param, return 1; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_http_async_client_exports[] = { + { str_init("http_async_client"), str_init("query"), + SR_KEMIP_INT, ki_http_async_query, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + pv_register_api_t pvra; + + pvra = (pv_register_api_t)find_export("pv_register_api", NO_SCRIPT, 0); + if (!pvra) { + LM_ERR("Cannot import pv functions (pv module must be loaded before this module)\n"); + return -1; + } + pvra(&pv_api); + sr_kemi_modules_add(sr_kemi_http_async_client_exports); + return 0; +} \ No newline at end of file

1 0

git:master:50c055a8: userblacklist: exported user check functions to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 50c055a880f16cbb6c1a74b4ef82248bc3519f01 URL: https://github.com/kamailio/kamailio/commit/50c055a880f16cbb6c1a74b4ef82248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T16:38:56+01:00 userblacklist: exported user check functions to kemi framework --- Modified: src/modules/tmrec/tmrec_mod.c Modified: src/modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/50c055a880f16cbb6c1a74b4ef82248… Patch: https://github.com/kamailio/kamailio/commit/50c055a880f16cbb6c1a74b4ef82248…

1 0

git:master:3de068a8: tm: t_check_status exported to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 3de068a8897917d088993923f3028ca98aadc765 URL: https://github.com/kamailio/kamailio/commit/3de068a8897917d088993923f3028ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T16:50:39+01:00 tm: t_check_status exported to kemi framework --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/3de068a8897917d088993923f3028ca… Patch: https://github.com/kamailio/kamailio/commit/3de068a8897917d088993923f3028ca… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 9bc1695a0f..7d7145393b 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -852,7 +852,6 @@ static int child_init(int rank) } - /**************************** wrapper functions ***************************/ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) { @@ -984,6 +983,98 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) return -1; } +static int ki_t_check_status(sip_msg_t* msg, str *sexp) +{ + regmatch_t pmatch; + struct cell *t; + char *status, *s = NULL; + char backup; + int lowest_status, n, ret; + regex_t re; + + /* first get the transaction */ + if (t_check(msg, 0 ) == -1) return -1; + + if ((t = get_t()) == 0) { + LM_ERR("cannot check status for a reply" + " which has no T-state established\n"); + goto error0; + } + + memset(&re, 0, sizeof(regex_t)); + if (regcomp(&re, sexp->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { + LM_ERR("Bad regular expression '%s'\n", s); + goto error0; + } + + switch(get_route_type()) { + case REQUEST_ROUTE: + /* use the status of the last sent reply */ + status = int2str( t->uas.status, 0); + break; + + case TM_ONREPLY_ROUTE: + case CORE_ONREPLY_ROUTE: + /* use the status of the current reply */ + status = msg->first_line.u.reply.status.s; + backup = status[msg->first_line.u.reply.status.len]; + status[msg->first_line.u.reply.status.len] = 0; + break; + + case FAILURE_ROUTE: + /* use the status of the winning reply */ + ret = t_pick_branch( -1, 0, t, &lowest_status); + if (ret == -1) { + /* t_pick_branch() retuns error also when there are only + * blind UACs. Let us give it another chance including the + * blind branches. */ + LM_DBG("t_pick_branch returned error," + " trying t_pick_branch_blind\n"); + ret = t_pick_branch_blind(t, &lowest_status); + } + if (ret < 0) { + LM_CRIT("BUG: t_pick_branch failed to get" + " a final response in FAILURE_ROUTE\n"); + goto error; + } + status = int2str( lowest_status , 0); + break; + case BRANCH_FAILURE_ROUTE: + status = int2str(t->uac[get_t_branch()].last_received, 0); + break; + default: + LM_ERR("unsupported route type %d\n", + get_route_type()); + goto error; + } + + LM_DBG("checked status is <%s>\n",status); + /* do the checking */ + n = regexec(&re, status, 1, &pmatch, 0); + + regfree(&re); + + if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ + /* t_check() above has the side effect of setting T and + * REFerencing T => we must unref and unset it. */ + UNREF( t ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); + } + if (n!=0) return -1; + return 1; + +error: + regfree(&re); +error0: + if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ + /* t_check() above has the side effect of setting T and + * REFerencing T => we must unref and unset it. */ + UNREF( t ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); + } + + return -1; +} inline static int w_t_check(struct sip_msg* msg, char* str, char* str2) { @@ -2818,6 +2909,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_check_status"), + SR_KEMIP_INT, ki_t_check_status, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_grep_status"), SR_KEMIP_INT, t_grep_status, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, @@ -2883,4 +2979,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(tm_kemi_exports); return 0; -} +} \ No newline at end of file

1 0

git:master:2de66166: uri_db: functions exported to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 2de661667ce0452a0095cd60d4913007045bb628 URL: https://github.com/kamailio/kamailio/commit/2de661667ce0452a0095cd60d491300… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T15:52:25+01:00 uri_db: functions exported to kemi framework --- Modified: src/modules/uri_db/checks.c Modified: src/modules/uri_db/checks.h Modified: src/modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/2de661667ce0452a0095cd60d491300… Patch: https://github.com/kamailio/kamailio/commit/2de661667ce0452a0095cd60d491300…

1 0

git:master:74208c21: ndb_mongodb: exported functions to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 74208c2160ffb6200dd6a8982fd4d94a2c00d879 URL: https://github.com/kamailio/kamailio/commit/74208c2160ffb6200dd6a8982fd4d94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T11:43:38+01:00 ndb_mongodb: exported functions to kemi framework --- Modified: src/modules/ndb_mongodb/ndb_mongodb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/74208c2160ffb6200dd6a8982fd4d94… Patch: https://github.com/kamailio/kamailio/commit/74208c2160ffb6200dd6a8982fd4d94… --- diff --git a/src/modules/ndb_mongodb/ndb_mongodb_mod.c b/src/modules/ndb_mongodb/ndb_mongodb_mod.c index 824d2aad07..73ca648977 100644 --- a/src/modules/ndb_mongodb/ndb_mongodb_mod.c +++ b/src/modules/ndb_mongodb/ndb_mongodb_mod.c @@ -29,6 +29,7 @@ #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/trim.h" +#include "../../core/kemi.h" #include "mongodb_client.h" #include "api.h" @@ -177,6 +178,42 @@ static int w_mongodb_do_cmd(sip_msg_t* msg, char* ssrv, char *sdname, char *scna return 1; } +/** + * + */ +static int ki_mongodbc_exec_simple(sip_msg_t* msg, str* ssrv, str *sdname, + str *scname, str* scmd, str* sres) +{ + return mongodbc_exec_simple(ssrv, sdname, scname, scmd, sres); +} + +/** + * + */ +static int ki_mongodbc_exec(sip_msg_t* msg, str* ssrv, str *sdname, + str *scname, str* scmd, str* sres) +{ + return mongodbc_exec(ssrv, sdname, scname, scmd, sres); +} + +/** + * + */ +static int ki_mongodbc_find(sip_msg_t* msg, str* ssrv, str *sdname, + str *scname, str* scmd, str* sres) +{ + return mongodbc_find(ssrv, sdname, scname, scmd, sres); +} + +/** + * + */ +static int ki_mongodbc_find_one(sip_msg_t* msg, str* ssrv, str *sdname, + str *scname, str* scmd, str* sres) +{ + return mongodbc_find_one(ssrv, sdname, scname, scmd, sres); +} + /** * */ @@ -239,6 +276,16 @@ static int w_mongodb_free_reply(struct sip_msg* msg, char* res) return 1; } +/** + * + */ +static int ki_mongodbc_free_reply(struct sip_msg* msg, str* name) +{ + if(mongodbc_free_reply(name)<0) + return -1; + return 1; +} + /** * */ @@ -257,6 +304,16 @@ static int w_mongodb_next_reply(struct sip_msg* msg, char* res) return 1;; } +/** + * + */ +static int ki_mongodbc_next_reply(struct sip_msg* msg, str* name) +{ + if(mongodbc_next_reply(name)<0) + return -1; + return 1;; +} + /** * */ @@ -382,3 +439,49 @@ static int pv_get_mongodb(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_ndb_mongodb_exports[] = { + { str_init("ndb_mongodb"), str_init("exec_simple"), + SR_KEMIP_INT, ki_mongodbc_exec_simple, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("exec"), + SR_KEMIP_INT, ki_mongodbc_exec, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("find"), + SR_KEMIP_INT, ki_mongodbc_find, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("find_one"), + SR_KEMIP_INT, ki_mongodbc_find_one, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("free_reply"), + SR_KEMIP_INT, ki_mongodbc_free_reply, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("next_reply"), + SR_KEMIP_INT, ki_mongodbc_next_reply, + { SR_KEMIP_STR, 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 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_ndb_mongodb_exports); + return 0; +} \ No newline at end of file

1 0

git:master:a0436852: mediaproxy: export functions to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: a04368528a3350a14038101a4bf17b4b742e362d URL: https://github.com/kamailio/kamailio/commit/a04368528a3350a14038101a4bf17b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T12:31:28+01:00 mediaproxy: export functions to kemi framework --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/a04368528a3350a14038101a4bf17b4… Patch: https://github.com/kamailio/kamailio/commit/a04368528a3350a14038101a4bf17b4… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 7250638d76..9caa0f8c64 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -48,6 +48,7 @@ #include "../../core/msg_translator.h" #include "../../modules/dialog/dlg_load.h" #include "../../modules/dialog/dlg_hash.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -173,8 +174,11 @@ typedef struct ice_candidate_data // Function prototypes // +static int w_EngageMediaProxy(struct sip_msg *msg, char *p1, char *p2); static int EngageMediaProxy(struct sip_msg *msg); +static int w_UseMediaProxy(struct sip_msg *msg, char *p1, char *p2); static int UseMediaProxy(struct sip_msg *msg); +static int w_EndMediaSession(struct sip_msg *msg, char *p1, char *p2); static int EndMediaSession(struct sip_msg *msg); static int mod_init(void); @@ -209,14 +213,12 @@ static AVP_Param media_relay_avp = {str_init(MEDIA_RELAY_AVP_SPEC), {0}, 0}; static AVP_Param ice_candidate_avp = {str_init(ICE_CANDIDATE_AVP_SPEC), {0}, 0}; static cmd_export_t commands[] = { - {"engage_media_proxy", (cmd_function)EngageMediaProxy, 0, 0, 0, - REQUEST_ROUTE}, - {"use_media_proxy", (cmd_function)UseMediaProxy, 0, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"end_media_session", (cmd_function)EndMediaSession, 0, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, + {"engage_media_proxy", (cmd_function)w_EngageMediaProxy, 0, 0, 0, + REQUEST_ROUTE | BRANCH_ROUTE}, + {"use_media_proxy", (cmd_function)w_UseMediaProxy, 0, 0, 0, + ANY_ROUTE}, + {"end_media_session", (cmd_function)w_EndMediaSession, 0, 0, 0, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0}}; static param_export_t parameters[] = { @@ -2016,6 +2018,10 @@ static int EngageMediaProxy(struct sip_msg *msg) return 1; } +static int w_EngageMediaProxy(struct sip_msg *msg, char *p1, char *p2) +{ + return EngageMediaProxy(msg); +} static int UseMediaProxy(struct sip_msg *msg) { @@ -2025,6 +2031,10 @@ static int UseMediaProxy(struct sip_msg *msg) return use_media_proxy(msg, "", NULL); } +static int w_UseMediaProxy(struct sip_msg *msg, char *p1, char *p2) +{ + return UseMediaProxy(msg); +} static int EndMediaSession(struct sip_msg *msg) { @@ -2044,6 +2054,10 @@ static int EndMediaSession(struct sip_msg *msg) return end_media_session(callid, from_tag, to_tag); } +static int w_EndMediaSession(struct sip_msg *msg, char *p1, char *p2) +{ + return EndMediaSession(msg); +} // // Module management: initialization/destroy/function-parameter-fixing/... @@ -2173,3 +2187,34 @@ static int child_init(int rank) return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_mediaproxy_exports[] = { + { str_init("mediaproxy"), str_init("engage_media_proxy"), + SR_KEMIP_INT, EngageMediaProxy, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("mediaproxy"), str_init("use_media_proxy"), + SR_KEMIP_INT, UseMediaProxy, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("mediaproxy"), str_init("end_media_session"), + SR_KEMIP_INT, EndMediaSession, + { 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 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_mediaproxy_exports); + return 0; +} \ No newline at end of file

1 0

git:master:6bdf8119: async: use t_continue_cb() for executing via kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 6bdf8119c1103b92e179144216bc19bbc8cdae0d URL: https://github.com/kamailio/kamailio/commit/6bdf8119c1103b92e179144216bc19b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T11:19:00+01:00 async: use t_continue_cb() for executing via kemi framework --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/6bdf8119c1103b92e179144216bc19b… Patch: https://github.com/kamailio/kamailio/commit/6bdf8119c1103b92e179144216bc19b…

1 0

git:master:b7d17060: http_async_client: exported functions to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: b7d170607ccc1ecac6cb2bf210790c8382386f2a URL: https://github.com/kamailio/kamailio/commit/b7d170607ccc1ecac6cb2bf210790c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T08:51:39+01:00 http_async_client: exported functions to kemi framework --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/b7d170607ccc1ecac6cb2bf210790c8… Patch: https://github.com/kamailio/kamailio/commit/b7d170607ccc1ecac6cb2bf210790c8… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index a828078f1d..59106a3bae 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -46,6 +46,7 @@ #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" #include "../../core/fmsg.h" +#include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" #include "async_http.h" @@ -56,7 +57,7 @@ extern struct tm_binds tmb; struct sip_msg *ah_reply = NULL; str ah_error = {NULL, 0}; -async_http_worker_t *workers; +async_http_worker_t *workers = NULL; int num_workers = 1; struct query_params ah_params; @@ -122,15 +123,18 @@ static inline char *strfindcasestrz(str *haystack, char *needlez) void async_http_cb(struct http_m_reply *reply, void *param) { - async_query_t *aq; - cfg_action_t *act; + async_query_t *aq = NULL; + cfg_action_t *act = NULL; int ri; unsigned int tindex; unsigned int tlabel; struct cell *t = NULL; char *p; str newbuf = {0, 0}; - sip_msg_t *fmsg; + sip_msg_t *fmsg = NULL; + sr_kemi_eng_t *keng = NULL; + str cbname = {0, 0}; + str evname = str_init("http_async_client:callback"); aq = param; @@ -139,15 +143,18 @@ void async_http_cb(struct http_m_reply *reply, void *param) ah_error.len = 0; memset(ah_reply, 0, sizeof(struct sip_msg)); - ri = route_lookup(&main_rt, aq->cbname); - if(ri<0) { - LM_ERR("unable to find route block [%s]\n", aq->cbname); - goto done; - } - act = main_rt.rlist[ri]; - if(act==NULL) { - LM_ERR("empty action lists in route block [%s]\n", aq->cbname); - goto done; + keng = sr_kemi_eng_get(); + if(keng==NULL) { + ri = route_lookup(&main_rt, aq->cbname); + if(ri<0) { + LM_ERR("unable to find route block [%s]\n", aq->cbname); + goto done; + } + act = main_rt.rlist[ri]; + if(act==NULL) { + LM_ERR("empty action lists in route block [%s]\n", aq->cbname); + goto done; + } } if (reply->result != NULL) { @@ -232,12 +239,30 @@ void async_http_cb(struct http_m_reply *reply, void *param) LM_DBG("resuming transaction (%d:%d)\n", tindex, tlabel); - if(act!=NULL) - tmb.t_continue(tindex, tlabel, act); + if(keng==NULL) { + if(act!=NULL) { + tmb.t_continue(tindex, tlabel, act); + } + } else { + cbname.s = aq->cbname; + cbname.len = aq->cbname_len; + tmb.t_continue_cb(tindex, tlabel, &cbname, &evname); + } } else { fmsg = faked_msg_next(); - if (run_top_route(act, fmsg, 0)<0) - LM_ERR("failure inside run_top_route\n"); + if(keng==NULL) { + if(act!=NULL) { + if (run_top_route(act, fmsg, 0)<0) { + LM_ERR("failure inside run_top_route\n"); + } + } + } else { + cbname.s = aq->cbname; + cbname.len = aq->cbname_len; + if(keng->froute(fmsg, EVENT_ROUTE, &cbname, &evname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } } done:

1 0

git:master:08de8388: tmx: exported the rest of the functions to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 08de83884bc40c5b426136c5dcb796e369c50027 URL: https://github.com/kamailio/kamailio/commit/08de83884bc40c5b426136c5dcb796e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T08:51:09+01:00 tmx: exported the rest of the functions to kemi framework --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/08de83884bc40c5b426136c5dcb796e… Patch: https://github.com/kamailio/kamailio/commit/08de83884bc40c5b426136c5dcb796e…

1 0

git:master:020f6b1e: tm: allow execution of t_continue with callback name
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 020f6b1ed77be268a981633cea8543cfc9521604 URL: https://github.com/kamailio/kamailio/commit/020f6b1ed77be268a981633cea8543c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T08:50:23+01:00 tm: allow execution of t_continue with callback name - t_continue_cb() exported to tm api --- Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/t_suspend.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/020f6b1ed77be268a981633cea8543c… Patch: https://github.com/kamailio/kamailio/commit/020f6b1ed77be268a981633cea8543c…

1 0

git:master:ad68b656: http_async_client: use directly the core fixup helper
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: ad68b65693936240a0101938de1bd466cb5e1bd0 URL: https://github.com/kamailio/kamailio/commit/ad68b65693936240a0101938de1bd46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T16:54:21+01:00 http_async_client: use directly the core fixup helper --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ad68b65693936240a0101938de1bd46… Patch: https://github.com/kamailio/kamailio/commit/ad68b65693936240a0101938de1bd46… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 42b68fcb71..26779bd64f 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -83,7 +83,6 @@ static void mod_destroy(void); static int w_http_async_query(sip_msg_t* msg, char* query, char* rt); static int set_query_param(str* param, str input); -static int fixup_http_async_query(void** param, int param_no); /* pv api binding */ static int ah_get_reason(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); @@ -125,7 +124,7 @@ enum http_req_name_t { }; static cmd_export_t cmds[]={ - {"http_async_query", (cmd_function)w_http_async_query, 2, fixup_http_async_query, + {"http_async_query", (cmd_function)w_http_async_query, 2, fixup_spve_spve, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -479,22 +478,6 @@ static int set_query_cparam(char** param, str input) return 1; } -/** - * - */ -static int fixup_http_async_query(void** param, int param_no) -{ - if (param_no == 1) { - return fixup_spve_null(param, 1); - } - if (param_no == 2) { - return fixup_var_str_12(param, param_no); - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - /* module PVs */ #define AH_WRAP_GET_PV(AH_F, PV_F) static int AH_F(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) \

1 0

git:master:2469b796: http_async_client: propagate route name to https async callback
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 2469b7963ac612e323478e172da4ab0e3a1773a9 URL: https://github.com/kamailio/kamailio/commit/2469b7963ac612e323478e172da4ab0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T17:22:24+01:00 http_async_client: propagate route name to https async callback - lookup actions in target process, rather than in originating one --- Modified: src/modules/http_async_client/async_http.c Modified: src/modules/http_async_client/async_http.h Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2469b7963ac612e323478e172da4ab0… Patch: https://github.com/kamailio/kamailio/commit/2469b7963ac612e323478e172da4ab0…

1 0

git:master:1f8bc9fd: http_async_client: use route_lookup() instead of route_get()
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 1f8bc9fd5a4067b25994e87e27801d9df5cb5eb7 URL: https://github.com/kamailio/kamailio/commit/1f8bc9fd5a4067b25994e87e27801d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T16:50:59+01:00 http_async_client: use route_lookup() instead of route_get() - avoids creating a useless route block structure --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1f8bc9fd5a4067b25994e87e27801d9… Patch: https://github.com/kamailio/kamailio/commit/1f8bc9fd5a4067b25994e87e27801d9… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 4012da24be..42b68fcb71 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -406,7 +406,7 @@ static int w_http_async_query(sip_msg_t *msg, char *query, char* rt) return -1; } - ri = route_get(&main_rt, rn.s); + ri = route_lookup(&main_rt, rn.s); if(ri<0) { LM_ERR("unable to find route block [%.*s]\n", rn.len, rn.s);

1 0

git:master:8141ccaf: http_client: exported functions to kemi framework
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 8141ccaf6a0367cae57b6033e7720674c4eb889b URL: https://github.com/kamailio/kamailio/commit/8141ccaf6a0367cae57b6033e772067… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T16:45:27+01:00 http_client: exported functions to kemi framework --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/8141ccaf6a0367cae57b6033e772067… Patch: https://github.com/kamailio/kamailio/commit/8141ccaf6a0367cae57b6033e772067…

1 0

git:master:56a357a7: http_client: clang format the code
by Daniel-Constantin Mierla 06 Dec '17

06 Dec '17

Module: kamailio Branch: master Commit: 56a357a7cbd85e2ef69ab4508f26a1510cde16d6 URL: https://github.com/kamailio/kamailio/commit/56a357a7cbd85e2ef69ab4508f26a15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T15:20:55+01:00 http_client: clang format the code --- Modified: src/modules/http_client/curl_api.c Modified: src/modules/http_client/curl_api.h Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/curlcon.h Modified: src/modules/http_client/curlrpc.c Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/56a357a7cbd85e2ef69ab4508f26a15… Patch: https://github.com/kamailio/kamailio/commit/56a357a7cbd85e2ef69ab4508f26a15…

1 0

[kamailio/kamailio] Segmentation Fault when sip_trace method is called with less then 2 arguments (#1351)
by Muhammad Shahzad Shafi 06 Dec '17

06 Dec '17

### Description  Segmentation fault when sip_trace method is called with less then 2 arguments. ### Troubleshooting The problem does not happen if either "xheaders_write" module param is set to zero or we provide both arguments to sip_trace method. #### Reproduction  <pre> .. # ----- siptrace params ----- modparam("siptrace", "trace_on", 1) modparam("siptrace", "hep_mode_on", 0) modparam("siptrace", "xheaders_write", 1) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "trace_flag", FLT_SIP_TRACE) modparam("siptrace", "traced_user_avp", "$avp(traced_user)") modparam("siptrace", "duplicate_uri", "WEBRTC_SIP_TRACE_ADDRESS")` .. request_route { .. sip_trace("WEBRTC_SIP_TRACE_ADDRESS"); setflag(FLT_SIP_TRACE); .. } .. </pre> #### Debugging Data  ``` #0 0xb766b417 in _IO_vfprintf_internal (s=0xbfedc5e0, format=0xb19c7a28 "X-Siptrace-Fromip: %.*s\r\nX-Siptrace-Toip: %.*s\r\nX-Siptrace-Time: %llu %llu\r\nX-Siptrace-Method: %.*s\r\nX-Siptrace-Dir: %s\r\n", ap=0xbfedc6fc "\025") at vfprintf.c:1629 len = <optimized out> string_malloced = <optimized out> step0_jumps = {0, -13653, -13579, -13501, -13418, -13344, -13248, -13024, -12733, -12367, -12140, -11875, -11660, -3450, -3880, -3819, -3480, -3465, -9946, -2661, -2926, -11572, -2279, -3349, -2058, -1997, -3269, -3593, -11660, -13100} space = 0 is_short = 0 use_outdigits = 0 step1_jumps = {0, 0, 0, 0, 0, 0, 0, 0, 0, -12367, -12140, -11875, -11660, -3450, -3880, -3819, -3480, -3465, -9946, -2661, -2926, -11572, -2279, -3349, -2058, -1997, -3269, -3593, -11660, 0} group = 0 prec = -1 step2_jumps = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -12140, -11875, -11660, -3450, -3880, -3819, -3480, -3465, -9946, -2661, -2926, -11572, -2279, -3349, -2058, -1997, -3269, -3593, -11660, 0} string = 0x9 <Address 0x9 out of bounds> left = 0 is_long_double = -1074936024 width = <optimized out> step3a_jumps = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -11961, 0, 0, 0, -3880, -3819, -3480, -3465, -9946, 0, 0, 0, 0, -3349, 0, 0, 0, 0, 0, 0} alt = 0 showsign = 0 is_long = 0 is_char = 0 pad = <optimized out> step3b_jumps = {0 <repeats 11 times>, -11660, 0, 0, -3880, -3819, -3480, -3465, -9946, -2661, -2926, -11572, -2279, -3349, -2058, -1997, -3269, 0, 0, 0} step4_jumps = {0 <repeats 14 times>, -3880, -3819, -3480, -3465, -9946, -2661, -2926, -11572, -2279, -3349, -2058, -1997, -3269, 0, 0, 0} is_negative = -1074936028 base = 0 the_arg = {pa_wchar = -1074927268 L'\xbfede95c', pa_int = -1074927268, pa_long_int = -1074927268, pa_long_long_int = -4616814309237986980, pa_u_int = 3220040028, pa_u_long_int = 3220040028, pa_u_long_long_int = 13829929764471564636, pa_double = -0.93064534650992981, pa_long_double = 3.3942842958442789709117117072106753e-4719, pa_string = 0xbfede95c "s\351\316", <incomplete sequence \370>, pa_wstring = 0xbfede95c L"\xf8cee973", pa_pointer = 0xbfede95c, pa_user = 0xbfede95c} spec = <optimized out> _buffer = {__routine = 0xbfede95c, __arg = 0xbfedc5d8, __canceltype = -1217805458, __prev = 0x0} _avail = 0 thousands_sep = 0x0 grouping = 0xffffffff <Address 0xffffffff out of bounds> f = <optimized out> lead_str_end = 0xb19c7a3b "%.*s\r\nX-Siptrace-Toip: %.*s\r\nX-Siptrace-Time: %llu %llu\r\nX-Siptrace-Method: %.*s\r\nX-Siptrace-Dir: %s\r\n" work_buffer = "_\262f\267 \307\355\277\242u\201\266\000\000\000\000\000\000\000\000h.~\266h.~\266|.~\266\252.~\266h.~\266\252.~\266\000\000\000\000\242u\201\266 ", '\000' <repeats 12 times>"\370, \201\202\266\000\000\000\000\304\301\355\277", '\000' <repeats 20 times>"\334, \307\355\277\000\000\000\000\000\000\000\000\004\000\000\000\377\377\377\377\355G\202\266\bp\342\266\304\301\355\277\304i\202\266-i\001\262", '\000' <repeats 20 times>"\340, \326x\267\000\000\000\000\000\000\000\000 \201\202\266\000\000\000\000h\302\355\277\215\034\202\266\002", '\000' <repeats 23 times>, "L\310\355\277\000\000\000\000\000\000\000\000\004\000\000\000\003\000\000\000\020\310\355\277\377\377\377\377\377\377\377\377\034'4\267c\302\355\277\000<g\267h.~\266C\000\000\000̥z\266\\\302\355\277h\023~\266\030\303\355\277`\306\355\277\250\242z\266\241u\201\266\000\000\000\000D\335f\267\000\000\000\000\232u\201\266\000\000\000\000H\310\355\277\016\000\000\000\232u\201\266\063\204i\267\261Q'\b,\\;\b\004\000\000\000\000*\000\000\001\000\000\000$\311\355\277\001\000\000\000\364"... workstart = 0x0 workend = 0xbfedc520 "\250\205 \267\260\205 \267" ap_save = 0xbfedc6fc "\025" nspecs_done = 5 save_errno = 0 readonly_format = 0 args_malloced = 0x0 specs = <optimized out> specs_malloced = false jump_table = "\001\000\000\004\000\016\000\006\000\000\a\002\000\003\t\000\005\b\b\b\b\b\b\b\b\b\000\000\000\000\000\000\000\032\000\031\000\023\023\023\000\035\000\000\f\000\000\000\000\000\000\025\000\000\000\000\022\000\r\000\000\000\000\000\000\032\000\024\017\023\023\023\n\017\034\000\v\030\027\021\026\f\000\025\033\020\000\000\022\000\r" __PRETTY_FUNCTION__ = "_IO_vfprintf_internal" #1 0xb768ede0 in _IO_vsnprintf ( string=0xb716a787 "X-Siptrace-Fromip: udp:185.18.45.53:5060\r\nX-Siptrace-Toip: udp:185.18.45.115:5060\r\nX-Siptrace-Time: 1512352655 48676\r\nX-Siptrace-Method: REGISTER\r\nX-Siptrace-Dir: ", maxlen=512, format=0xb19c7a28 "X-Siptrace-Fromip: %.*s\r\nX-Siptrace-Toip: %.*s\r\nX-Siptrace-Time: %llu %llu\r\nX-Siptrace-Method: %.*s\r\nX-Siptrace-Dir: %s\r\n", args=0xbfedc6fc "\025") at vsnprintf.c:120 sf = {f = {_sbf = {_f = {_flags = -72515583, _IO_read_ptr = 0xb716a787 "X-Siptrace-Fromip: udp:185.18.45.53:5060\r\nX-Siptrace-Toip: udp:185.18.45.115:5060\r\nX-Siptrace-Time: 1512352655 48676\r\nX-Siptrace-Method: REGISTER\r\nX-Siptrace-Dir: ", _IO_read_end = 0xb716a787 "X-Siptrace-Fromip: udp:185.18.45.53:5060\r\nX-Siptrace-Toip: udp:185.18.45.115:5060\r\nX-Siptrace-Time: 1512352655 48676\r\nX-Siptrace-Method: REGISTER\r\nX-Siptrace-Dir: ", _IO_read_base = 0xb716a787 "X-Siptrace-Fromip: udp:185.18.45.53:5060\r\nX-Siptrace-Toip: udp:185.18.45.115:5060\r\nX-Siptrace-Time: 1512352655 48676\r\nX-Siptrace-Method: REGISTER\r\nX-Siptrace-Dir: ", _IO_write_base = 0xb716a787 "X-Siptrace-Fromip: udp:185.18.45.53:5060\r\nX-Siptrace-Toip: udp:185.18.45.115:5060\r\nX-Siptrace-Time: 1512352655 48676\r\nX-Siptrace-Method: REGISTER\r\nX-Siptrace-Dir: ", _IO_write_ptr = 0xb716a82a "", _IO_write_end = 0xb716a986 "", _IO_buf_base = 0xb716a787 "X-Siptrace-Fromip: udp:185.18.45.53:5060\r\nX-Siptrace-Toip: udp:185.18.45.115:5060\r\nX-Siptrace-Time: 1512352655 48676\r\nX-Siptrace-Method: REGISTER\r\nX-Siptrace-Dir: ", _IO_buf_end = 0xb716a986 "", _IO_save_base = 0x0, _IO_backup_base = 0x0, _IO_save_end = 0x0, _markers = 0x0, _chain = 0x0, _fileno = -1074936088, _flags2 = 0, _old_offset = 5, _cur_column = 0, _vtable_offset = 0 '\000', _shortbuf = "", _lock = 0x0, _offset = 593186573409608927, _codecvt = 0x23e, _wide_data = 0xb19c47b0, _freeres_list = 0x0, _freeres_buf = 0x5, _freeres_size = 0, _mode = -1, _unused2 = "`b<\b\vl;\b?\000\000\000ha<\b\224\066*\267\\\344\355\277\364\066*\267H\320\355\277\375x\234\261\204\065*\267"}, vtable = 0xb778d6e0}, _s = {_allocate_buffer = 0, _free_buffer = 0xffffffff}}, overflow_buf = "\000\000\000\000\004\000\000\000\375x\234\261a\245\026\267)\002\000\000<\270j\267\210\247\026\267\000\000\000\000\001\000\000\000\000y\234\261\004\000\000\000\000\000\000\000`\245\026\267\000\000\000\000\002\000\000\000\375x\234\261"} ret = 0 #2 0xb7673cf2 in __snprintf ( s=0xb716a787 "X-Siptrace-Fromip: udp:185.18.45.53:5060\r\nX-Siptrace-Toip: udp:185.18.45.115:5060\r\nX-Siptrace-Time: 1512352655 48676\r\nX-Siptrace-Method: REGISTER\r\nX-Siptrace-Dir: ", maxlen=512, format=0xb19c7a28 "X-Siptrace-Fromip: %.*s\r\nX-Siptrace-Toip: %.*s\r\nX-Siptrace-Time: %llu %llu\r\nX-Siptrace-Method: %.*s\r\nX-Siptrace-Dir: %s\r\n") at snprintf.c:35 done = 0 #3 0xb19ae7c3 in sip_trace_xheaders_write (sto=0xbfedc924) at siptrace.c:594 buf = 0xb716a548 "SIP/2.0 401 Unauthorized\r\nVia: SIP/2.0/UDP 185.18.45.115;branch=z9hG4bK8c01.866bb318e1643e5b7f0134b81ff246af.0\r\nVia: SIP/2.0/WSS 6qb17qtojlum.invalid;rport=4076;received=185.9.249.194;branch=z9hG4bK35"... bytes_written = 0 eoh = 0xb716a787 "X-Siptrace-Fromip: udp:185.18.45.53:5060\r\nX-Siptrace-Toip: udp:185.18.45.115:5060\r\nX-Siptrace-Time: 1512352655 48676\r\nX-Siptrace-Method: REGISTER\r\nX-Siptrace-Dir: " eoh_offset = 0 new_eoh = 0x0 __FUNCTION__ = "sip_trace_xheaders_write" #4 0xb19b01fe in sip_trace_store (sto=0xbfedc924, dst=0x0, correlation_id_str=0x0) at siptrace.c:750 __FUNCTION__ = "sip_trace_store" ret = -1 #5 0xb19b64bd in sip_trace (msg=0xb72a3584, dst=0x0, correlation_id_str=0x0, dir=0x9 <Address 0x9 out of bounds>) at siptrace.c:1151 sto = {avp = 0x0, avp_value = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, state = {flags = 257, id = 75, name = {n = -1226220299, s = { s = 0xb6e95cf5 "traced_user)", len = 11}, re = 0xb6e95cf5}, avp = 0x0}, body = { s = 0x8488500 "SIP/2.0 401 Unauthorized\r\nVia: SIP/2.0/UDP 185.18.45.115;branch=z9hG4bK8c01.866bb318e1643e5b7f0134b81ff246af.0\r\nVia: SIP/2.0/WSS 6qb17qtojlum.invalid;rport=4076;received=185.9.249.194;branch=z9hG4bK35"..., len = 577}, callid = { s = 0x848866f "0b5l88q765nk5ahdvqqd1a\r\nCSeq: 202 REGISTER\r\nWWW-Authenticate: Digest realm=\"acs.dummy.com\", nonce=\"5a24acbba41b8f45ded1be19fc13951d5438c8e0\"\r\nServer: OpenSER (1.3.4-notls (i386/linux))\r\nContent-Len"..., len = 22}, method = { s = 0x8488691 "REGISTER\r\nWWW-Authenticate: Digest realm=\"acs.dummy.com\", nonce=\"5a24acbba41b8f45ded1be19fc13951d5438c8e0\"\r\nServer: OpenSER (1.3.4-notls (i386/linux))\r\nContent-Length: 0\r\n\r\n", len = 8}, status = { s = 0x8488508 "401 Unauthorized\r\nVia: SIP/2.0/UDP 185.18.45.115;branch=z9hG4bK8c01.866bb318e1643e5b7f0134b81ff246af.0\r\nVia: SIP/2.0/WSS 6qb17qtojlum.invalid;rport=4076;received=185.9.249.194;branch=z9hG4bK3573981\r\nT"..., len = 3}, dir = 0x9 <Address 0x9 out of bounds>, fromtag = { s = 0x848865a "coqoo7bgrr\r\nCall-ID: 0b5l88q765nk5ahdvqqd1a\r\nCSeq: 202 REGISTER\r\nWWW-Authenticate: Digest realm=\"acs.dummy.com\", nonce=\"5a24acbba41b8f45ded1be19fc13951d5438c8e0\"\r\nServer: OpenSER (1.3.4-notls (i386"..., len = 10}, fromip = {s = 0xbfedc9bc "udp:185.18.45.53:5060", len = 21}, totag = { s = 0x84885f8 "f585cd8bc1f6d3796bfeb421b703352f.8488\r\nFrom: \"James Howlett\" <sip:998100601189@172.16.171.60>;tag=coqoo7bgrr\r\nCall-ID: 0b5l88q765nk5ahdvqqd1a\r\nCSeq: 202 REGISTER\r\nWWW-Authenticate: Digest realm=\"acs.a"..., len = 37}, toip = {s = 0xbfedc988 "udp:185.18.45.115:5060", len = 22}, toip_buff = "udp:185.18.45.115:5060", '\000' <repeats 29 times>, fromip_buff = "udp:185.18.45.53:5060", '\000' <repeats 30 times>, tv = { tv_sec = 1512352655, tv_usec = 48676}, stat = 0x70} snd_inf = 0x0 __FUNCTION__ = "sip_trace" #6 0x08078b06 in do_action (h=0xbfede244, a=0xb712fe5c, msg=0xb72a3584) at core/action.c:1054 ret = -5 v = 2 dst = {send_sock = 0x9cf, to = {s = {sa_family = 65456, sa_data = "<\b\372\317'\b\304\322\355\277\000\000\000"}, sin = {sin_family = 65456, sin_port = 2108, sin_addr = {s_addr = 136826874}, sin_zero = "\304\322\355\277\000\000\000"}, sin6 = {sin6_family = 65456, sin6_port = 2108, sin6_flowinfo = 136826874, sin6_addr = {__in6_u = {__u6_addr8 = "\304\322\355\277\000\000\000\000\034\000\000\000\\U\002\266", __u6_addr16 = {53956, 49133, 0, 0, 28, 0, 21852, 46594}, __u6_addr32 = {3220034244, 0, 28, 3053606236}}}, sin6_scope_id = 0}}, id = -1074927268, proto = -88 '\250', send_flags = {f = 49133, blst_imask = 28680}} tmp = 0x8274cdd "\270" new_uri = 0xb72a3a18 "\200" end = 0x8274cdd "\270" crt = 0xbfedd408 "\b\325\355\277\371C\b\bD\342\355\277\\\376\022\267\204\065*\267\220\032=\b\vl;\b\317\t" cmd = 0xb6e8ab64 len = 0 user = 0 uri = {user = {s = 0xb23c3d00 "", len = 8388608}, passwd = {s = 0x285e8c <Address 0x285e8c out of bounds>, len = 4531876}, host = { s = 0x57a174 <Address 0x57a174 out of bounds>, len = 5755668}, port = {s = 0x4 <Address 0x4 out of bounds>, len = 8}, params = {s = 0x0, len = -1226674168}, sip_params = {s = 0xbfedd208 "\001", len = 135116871}, headers = {s = 0x0, len = 0}, port_no = 53768, proto = 49133, type = 136793309, flags = 3068293128, transport = {s = 0xb71997d4 " ", len = -1217821645}, ttl = {s = 0x0, len = -1223059524}, user_param = { s = 0x3c0 <Address 0x3c0 out of bounds>, len = 1}, maddr = {s = 0x0, len = 5}, method = {s = 0x0, len = -1074932984}, lr = { s = 0x8197d1c "\205\300\017\237\300\017\266ЋE\020\211\020\213E\b\213@\004\211\302\203\342\371\213E\b\211P\004\351\341\004", len = -1074929084}, r2 = { s = 0xb712f764 "\255\r", len = -1221970556}, gr = {s = 0x80db847 "\211E\364\213E\364\351\373\001", len = 0}, transport_val = {s = 0x0, len = -1074933160}, ttl_val = {s = 0x8274cdd "\270", len = -1226674168}, user_param_val = {s = 0xb71caee4 "l", len = -1245326265}, maddr_val = {s = 0x0, len = -1222857012}, method_val = {s = 0xa0 <Address 0xa0 out of bounds>, len = -1074932952}, lr_val = {s = 0x8275535 "\213E܃\300\034\351\a\003", len = 5}, r2_val = {s = 0x0, len = 32}, gr_val = {s = 0x83d1a90 "core: core/parser/parse_via.c", len = 138112011}} next_hop = {user = {s = 0xb6dfb1d5 "U\211\345S\203\354\024\350\372\343\377\377\201ÿ\263\002", len = -1226848018}, passwd = {s = 0x0, len = -1074932385}, host = {s = 0xa <Address 0xa out of bounds>, len = 0}, port = {s = 0x0, len = -1074931896}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 2}, headers = {s = 0xb73a2138 "h\037:\267\006", len = 0}, port_no = 65535, proto = 65535, type = SIP_URI_T, flags = 0, transport = {s = 0x0, len = -1074927268}, ttl = {s = 0xbfedd158 "\204\065*\267\240\070*\267", len = -1221970284}, user_param = {s = 0xbfede45c "\020", len = -1221970188}, maddr = { s = 0xbfedd218 "\b\323\355\277\034}\031\bD\342\355\277d\367\022\267\204\065*\267G\270\r\b", len = 134761067}, method = {s = 0xbfedd160 "", len = -1223493788}, lr = {s = 0xb72a3584 "\001", len = -1221969760}, r2 = {s = 0x0, len = 0}, gr = {s = 0x1 <Address 0x1 out of bounds>, len = -1221970284}, transport_val = {s = 0xbfede45c "\020", len = -1221970188}, ttl_val = { s = 0xbfedd148 "\030\322\355\277kJ\b\b`\321\355\277d\367\022\267\204\065*\267\240\070*\267", len = -1281299135}, user_param_val = { s = 0x7881ec2e <Address 0x7881ec2e out of bounds>, len = 0}, maddr_val = {s = 0xb72a377c "", len = -1226674168}, method_val = {s = 0xbfedd3c0 "\260\237W", len = -1226183112}, lr_val = {s = 0xbfedd1d8 "\b\322\355\277G\270\r\b", len = -1232975437}, r2_val = {s = 0xb6e27008 "\001", len = -1074933324}, gr_val = { s = 0xbfedd278 "\260\377<\b\372\317'\b\304\322", <incomplete sequence \355\277>, len = -1313472512}} u = 0x80db847 port = 49133 dst_host = 0xfa20d i = -1226674168 flags = 0 avp = 0x0 st = {flags = 3220033768, id = 0, name = {n = 0, s = {s = 0x0, len = -1226821088}, re = 0x0}, avp = 0xb6dfb190} sct = 0xb72a3694 sjt = 0xb774731f rve = 0x4 mct = 0xbfede45c rv = 0x0 rv1 = 0x8 c1 = {cache_type = RV_CACHE_EMPTY, val_type = 3078153004, c = {avp_val = {n = -1074933548, s = {s = 0xbfedd0d4 "\350\320", <incomplete sequence \355\277>, len = -1218077169}, re = 0xbfedd0d4}, pval = {rs = {s = 0xbfedd0d4 "\350\320", <incomplete sequence \355\277>, len = -1218077169}, ri = -1216814292, flags = -1074933564}}, i2s = ",\343x\267D\340x\267\304\320\355\277\377\377\377\377\000\000\000\000\000"} s = {s = 0xb778e0bc "\303~6\033\b", len = -1216815116} srevp = {0xb7659c74, 0xb778e0c0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #7 0x080843f9 in run_actions (h=0xbfede244, a=0xb712fe5c, msg=0xb72a3584) at core/action.c:1552 t = 0xb712fe5c ret = -1 mod = 0x4 ms = 0 __FUNCTION__ = "run_actions" #8 0x08078a8a in do_action (h=0xbfede244, a=0xb712ff08, msg=0xb72a3584) at core/action.c:1045 ret = 1 v = 1 dst = {send_sock = 0xbfedddd4, to = {s = {sa_family = 13301, sa_data = "|\267\000\000\000\000\270\230\031\267\304\002\000"}, sin = {sin_family = 13301, sin_port = 46972, sin_addr = {s_addr = 0}, sin_zero = "\270\230\031\267\304\002\000"}, sin6 = {sin6_family = 13301, sin6_port = 46972, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\270\230\031\267\304\002\000\000\070\336\355\277\065U'\b", __u6_addr16 = {39096, 46873, 708, 0, 56888, 49133, 21813, 2087}, __u6_addr32 = {3071908024, 708, 3220037176, 136795445}}}, sin6_scope_id = 5}}, id = 0, proto = 4 '\004', send_flags = { f = 46946, blst_imask = 11736}} tmp = 0xb72a36f4 "" new_uri = 0xb77d7908 "" end = 0xbfedde84 "\377\377\377\377\364o}\267<Y\005\b\005" crt = 0xbfede45c "\020" cmd = 0xbfede45c len = -1221970284 user = -1218240796 uri = {user = {s = 0x83bd30c "core", len = 4}, passwd = {s = 0xb71cadb0 "\001", len = 138149819}, host = {s = 0x2000007e <Address 0x2000007e out of bounds>, len = 4096}, port = {s = 0x0, len = -1222857296}, params = {s = 0xb71caf00 "\001", len = -1221969600}, sip_params = {s = 0xb72a3728 "", len = -1221969516}, headers = {s = 0xb72a38ec "", len = -1217109483}, port_no = 33272, proto = 46722, type = 136826874, flags = 3220036884, transport = { s = 0x0, len = 28}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0xb6e27008 "\001", len = 0}, method = {s = 0x0, len = -1074930376}, lr = {s = 0xb68249b3 "\213\223\324\a", len = -1226674168}, r2 = { s = 0xbfeddd14 "\344\036c\267\020ii\rT\335\355\277v-|\267\060\312c\267\262\300\005\b", len = 0}, gr = {s = 0x0, len = 0}, transport_val = { s = 0xb7631ee4 "\032L", len = 225011984}, ttl_val = {s = 0xbfeddd54 "\324\335\355\277\365\063|\267", len = -1216598666}, user_param_val = { s = 0xb763ca30 "GLIBC_2.0", len = 134594738}, maddr_val = {s = 0x1000 <Address 0x1000 out of bounds>, len = 134567646}, method_val = { s = 0xb7629020 "\262\300\005\b\020ii\r", len = -1074987006}, lr_val = {s = 0xb77c8ab0 "\205\300u\344\203\304\b\270\001", len = 134567646}, r2_val = { s = 0xb77b7c30 "libresolv.so.2", len = -1216516108}, gr_val = { s = 0xb762c9a8 "\227\201B\250|`\234|\374Qcq\\zy\360\003\346`\033|\231/\310Km\301\243\353\372\266=/\222\210\353", <incomplete sequence \352>, len = 3}} next_hop = {user = {s = 0xffffffff <Address 0xffffffff out of bounds>, len = 138138380}, passwd = {s = 0x4 <Address 0x4 out of bounds>, len = -1223059220}, host = {s = 0x83bffc9 "get_hdr_field", len = 135}, port = {s = 0x83bd30c "core", len = -1074930680}, params = {s = 0x8274cdd "\270", len = -1226674168}, sip_params = {s = 0xb71cab74 "\b", len = 35}, headers = {s = 0x0, len = -1222857892}, port_no = 1040, proto = 0, type = 3220036824, flags = 136795445, transport = {s = 0x5 <Address 0x5 out of bounds>, len = 1}, ttl = {s = 0xb8 <Address 0xb8 out of bounds>, len = -1230656743}, user_param = { s = 0x83b6c0b "fragm. from qm_malloc", len = -1222857616}, maddr = {s = 0xc9 <Address 0xc9 out of bounds>, len = -1226674168}, method = { s = 0xb73a2298 "", len = -1222857684}, lr = {s = 0xb68281f8 <incomplete sequence \320>, len = -1230628236}, r2 = {s = 0xb6a5ab19 "core: db_id.c", len = -1217105105}, gr = {s = 0xb6a61a74 "@\331\002", len = -1230774707}, transport_val = { s = 0x848856c ".0\r\nVia: SIP/2.0/WSS 6qb17qtojlum.invalid;rport=4076;received=185.9.249.194;branch=z9hG4bK3573981\r\nTo: <sip:998100601189@172.16.171.60>;tag=f585cd8bc1f6d3796bfeb421b703352f.8488\r\nFrom: \"James Howlett\""..., len = 1}, ttl_val = {s = 0x6f <Address 0x6f out of bounds>, len = -1222857212}, user_param_val = {s = 0x0, len = -1222857324}, maddr_val = {s = 0x0, len = 138970480}, method_val = {s = 0x10002 <Address 0x10002 out of bounds>, len = 26}, lr_val = { s = 0x8488500 "SIP/2.0 401 Unauthorized\r\nVia: SIP/2.0/UDP 185.18.45.115;branch=z9hG4bK8c01.866bb318e1643e5b7f0134b81ff246af.0\r\nVia: SIP/2.0/WSS 6qb17qtojlum.invalid;rport=4076;received=185.9.249.194;branch=z9hG4bK35"..., len = 0}, r2_val = {s = 0xbfede45c "\020", len = -1221970188}, gr_val = { s = 0xbfeddf18 "h\340\355\277P\230\031\267\204\065*\267\002", len = 136893382}} u = 0x0 port = 2114 dst_host = 0x5 i = 134567476 flags = -1 avp = 0x5 st = {flags = 138970945, id = 38528, name = {n = -1221970284, s = {s = 0xb72a3694 "\002", len = -1074928548}, re = 0xb72a3694}, avp = 0xb72a36f4} sct = 0x805593c sjt = 0xb77b7c98 rve = 0xb712faa0 mct = 0xb7629020 rv = 0x84885d3 rv1 = 0x0 c1 = {cache_type = RV_CACHE_EMPTY, val_type = 3072997108, c = {avp_val = {n = -1074930152, s = {s = 0xbfedde18 "\210\337\355\277PY<\266", len = 136889644}, re = 0xbfedde18}, pval = {rs = {s = 0xbfedde18 "\210\337\355\277PY<\266", len = 136889644}, ri = -1226674168, flags = -1223058892}}, i2s = "`\327;\b\273\377;\bO\001\000\000\f\323;\b\221\206H\b\231\206"} s = {s = 0x4 <Address 0x4 out of bounds>, len = 126} srevp = {0x579ca4, 0x57d314} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #9 0x080843f9 in run_actions (h=0xbfede244, a=0xb712ff08, msg=0xb72a3584) at core/action.c:1552 t = 0xb712ff08 ret = -1 mod = 0x0 ms = 0 __FUNCTION__ = "run_actions" #10 0x08084b03 in run_top_route (a=0xb712ff08, msg=0xb72a3584, c=0xbfede244) at core/action.c:1641 ctx = {rec_lev = 0, run_flags = 126, last_retcode = 0, jmp_env = {{__jmpbuf = {14, 0, 0, 0, 94, 0}, __mask_was_saved = 0, __saved_mask = {__val = {0, 0, 0, 0, 0, 0, 0, 0, 0, 3061963914, 3062006264, 3220038748, 3220037764, 3061964261, 35, 1, 4, 3072110084, 3220038180, 2310458, 3220037784, 3061965435, 35, 1, 4, 3220037832, 136011880, 3072996740, 1073741828, 0, 135068986, 3072996740}}}}} p = 0xbfede244 ret = -1222607340 sfbk = 0 #11 0x0815f9ce in receive_msg ( buf=0x8488500 "SIP/2.0 401 Unauthorized\r\nVia: SIP/2.0/UDP 185.18.45.115;branch=z9hG4bK8c01.866bb318e1643e5b7f0134b81ff246af.0\r\nVia: SIP/2.0/WSS 6qb17qtojlum.invalid;rport=4076;received=185.9.249.194;branch=z9hG4bK35"..., len=577, rcv_info=0xbfede3fc) at core/receive.c:327 msg = 0xb72a3584 ctx = {rec_lev = 2, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {-1221970284, -1074928548, -1221970188, -1074929688, -1279414975, 2021780526}, __mask_was_saved = 0, __saved_mask = {__val = {3078323352, 3078453512, 4294967295, 3078451188, 134568902, 5, 3220038336, 3078388710, 3078453952, 3076689952, 1, 5, 0, 5, 134567476, 138561348, 0, 3076746516, 1546143882, 0, 3220040028, 3220038488, 3078412688, 3220038664, 3077676560, 50195, 3078453512, 1104, 136655121, 0, 1546143882, 3220038424}}}}} bctx = 0x80559e6 ret = 1 stats_on = 0 tvb = {tv_sec = -1074928848, tv_usec = -1216513344} tve = {tv_sec = 134568902, tv_usec = -1216516108} tz = {tz_minuteswest = -1218219948, tz_dsttime = 134538164} diff = 0 inb = { s = 0x8488500 "SIP/2.0 401 Unauthorized\r\nVia: SIP/2.0/UDP 185.18.45.115;branch=z9hG4bK8c01.866bb318e1643e5b7f0134b81ff246af.0\r\nVia: SIP/2.0/WSS 6qb17qtojlum.invalid;rport=4076;received=185.9.249.194;branch=z9hG4bK35"..., len = 577} netinfo = {data = {s = 0xbfede2b0 "\024mc\267\212H(\\", len = -1074929048}, dst = 0xbfede274, rcv = 0xb7629020} keng = 0x0 __FUNCTION__ = "receive_msg" #12 0x0825a456 in udp_rcv_loop () at core/udp_server.c:515 len = 577 buf = "SIP/2.0 401 Unauthorized\r\nVia: SIP/2.0/UDP 185.18.45.115;branch=z9hG4bK8c01.866bb318e1643e5b7f0134b81ff246af.0\r\nVia: SIP/2.0/WSS 6qb17qtojlum.invalid;rport=4076;received=185.9.249.194;branch=z9hG4bK35"... tmp = 0x834e413 "counters_prefork_init" from = 0xb71cad60 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {892171861, 4, 1546143882, 1}, addr32 = {892171861, 4, 1546143882, 1}, addr16 = {30293, 13613, 4, 0, 18570, 23592, 1, 0}, addr = "Uv-5\004\000\000\000\212H(\\\001\000\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {1932359253, 0, 0, 0}, addr32 = { 1932359253, 0, 0, 0}, addr16 = {30293, 29485, 0, 0, 0, 0, 0, 0}, addr = "Uv-s", '\000' <repeats 11 times>}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023\304Uv-5\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 892171861}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 892171861, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0xb6e7896c, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" #13 0x080693c6 in main_loop () at main.c:1623 i = 1 pid = 0 si = 0xb6e7896c si_desc = "udp receiver child=1 sock=185.18.45.115:5060\000\000\000\000\004\000\000\000\b\347\355\277\212H(\\\001\000\000\000\212H(\\\210\346\355\277L\343'\bd\204\271\261\004\000\000\000\031\251\066\b\350\272\066\bq\000\000\000\264\247\066\b\b\020\000\000y\221f\266\070\200 \267\277\064\300\265\230\061\301\265\f\200\001\262\f\034\300\265" nrprocs = 4 woneinit = 1 __FUNCTION__ = "main_loop" #14 0x080708ac in main (argc=13, argv=0xbfedead4) at main.c:2643 cfg_stream = 0x8e7a008 c = -1 r = 0 tmp = 0xbfee090d "" tmp_len = 1 port = 0 proto = 0 options = 0x83422fc ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 4174309747 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xbfedea00 p = 0x805d5ec "[\201\303$o<" st = {st_dev = 14, __pad1 = 0, st_ino = 6140, st_mode = 16832, st_nlink = 2, st_uid = 0, st_gid = 0, st_rdev = 0, __pad2 = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1510541218, tv_nsec = 950311164}, st_mtim = {tv_sec = 1512352641, tv_nsec = 828578904}, st_ctim = {tv_sec = 1512352652, tv_nsec = 920812953}, __unused4 = 0, __unused5 = 0} __FUNCTION__ = "main" ``` #### Log Messages  ``` Dec 4 02:57:35 webrtc-as-rct kernel: [1811495.918954] kamailio[15829] segfault at 9 ip b766b417 sp bfedbffc error 4 in libc-2.13.so[b762a000+161000] Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15901]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 24 Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15826]: ALERT: <core> [main.c:743]: handle_sigs(): child process 15829 exited by a signal 11 Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15826]: ALERT: <core> [main.c:746]: handle_sigs(): core was generated Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15826]: INFO: <core> [main.c:768]: handle_sigs(): terminating due to SIGCHLD Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15899]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15897]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15895]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15893]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15891]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15888]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15887]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15885]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15865]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15861]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15871]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15867]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15873]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15875]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15881]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15877]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15879]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15883]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15901]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15846]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15849]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15840]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15844]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15848]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15842]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15856]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15860]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15854]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15858]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15852]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15834]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15835]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15830]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15836]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15828]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15831]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15837]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15832]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15833]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15869]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Dec 4 02:57:35 webrtc-as-rct adx-webrtc[15826]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` #### SIP Traffic  ``` N/A ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.4 (i386/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, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select. id: unknown compiled on 11:05:34 Dec 1 2017 with gcc 4.7.2 ``` * **Operating System**:  ``` Linux webrtc-as-rct 3.10-0.bpo.2-686-pae #1 SMP Debian 3.10.5-1~bpo70+1 (2013-08-11) i686 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/1351

2 4

Kamailio 5.1 nightly (rc2) crashing - udp_rcv_loop(): print buffer building failed
by George Diamantopoulos 06 Dec '17

06 Dec '17

Hello, I've just installed kamailio 5.1 nightly from the debian repo for stretch. I didn't change anything in the configuration compared to 5.0.4 (which I was testing previously), apart from the database structure as found in the wiki for upgrading from 5.0.x. Now kamailio crashes after a while, with the following output in the logs: Nov 29 15:47:05 modcom-sbc-dev1 kamailio[2497]: 3(2502) ERROR: <core> [core/udp_server.c:481]: udp_rcv_loop(): print buffer building failed Nov 29 15:47:05 modcom-sbc-dev1 kamailio[2497]: 121(2620) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 26 Nov 29 15:47:05 modcom-sbc-dev1 kamailio[2497]: 121(2620) DEBUG: <core> [core/tcp_main.c:3512]: handle_ser_child(): dead child 3, pid 2502 (shutting down?) Nov 29 15:47:05 modcom-sbc-dev1 kamailio[2497]: 121(2620) DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x55ae7132ffc0, 26, -1, 0x0) fd_no=126 called Nov 29 15:47:05 modcom-sbc-dev1 kamailio[2497]: 0(2499) ALERT: <core> [main.c:741]: handle_sigs(): child process 2502 exited normally, status=255 Nov 29 15:47:05 modcom-sbc-dev1 kamailio[2497]: 0(2499) INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD Nov 29 15:47:05 modcom-sbc-dev1 kamailio[2497]: 0(2499) DEBUG: <core> [main.c:773]: handle_sigs(): terminating due to SIGCHLD Nov 29 15:47:05 modcom-sbc-dev1 kamailio[2497]: 118(2617) INFO: <core> [main.c:826]: sig_usr(): signal 15 received Let me know if I can somehow help dissect this issue, I don't really know where to start. Thanks. BR, George

2 6

git:master:e7d1e960: crypto: exported functions to kemi interface
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: e7d1e96007683efcc193e0f6df16a1acb02be6b8 URL: https://github.com/kamailio/kamailio/commit/e7d1e96007683efcc193e0f6df16a1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T15:13:47+01:00 crypto: exported functions to kemi interface --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e7d1e96007683efcc193e0f6df16a1a… Patch: https://github.com/kamailio/kamailio/commit/e7d1e96007683efcc193e0f6df16a1a…

1 0

git:master:2b7ae0f0: dmq: exported functions to kemi framework
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: 2b7ae0f01ae7f9ee9a9ccf12ef9ffad24a76764f URL: https://github.com/kamailio/kamailio/commit/2b7ae0f01ae7f9ee9a9ccf12ef9ffad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T13:19:17+01:00 dmq: exported functions to kemi framework --- Modified: src/modules/dmq/bind_dmq.c Modified: src/modules/dmq/bind_dmq.h Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmq_funcs.h Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/notification_peer.h Modified: src/modules/dmq/peer.c Modified: src/modules/dmq/peer.h Modified: src/modules/dmq/worker.c Modified: src/modules/dmq/worker.h --- Diff: https://github.com/kamailio/kamailio/commit/2b7ae0f01ae7f9ee9a9ccf12ef9ffad… Patch: https://github.com/kamailio/kamailio/commit/2b7ae0f01ae7f9ee9a9ccf12ef9ffad…

1 0

git:master:727b5c5f: dmq: use core fixup helper functions directly
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: 727b5c5fed1e0972b80f005a801089a4afa2f114 URL: https://github.com/kamailio/kamailio/commit/727b5c5fed1e0972b80f005a801089a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T12:10:24+01:00 dmq: use core fixup helper functions directly --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/727b5c5fed1e0972b80f005a801089a… Patch: https://github.com/kamailio/kamailio/commit/727b5c5fed1e0972b80f005a801089a… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index f06111f830..b01e4604df 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -85,24 +85,22 @@ dmq_peer_t* dmq_notification_peer = NULL; static int mod_init(void); static int child_init(int); static void destroy(void); -static int handle_dmq_fixup(void** param, int param_no); -static int send_dmq_fixup(void** param, int param_no); -static int bcast_dmq_fixup(void** param, int param_no); static cmd_export_t cmds[] = { - {"dmq_handle_message", (cmd_function)dmq_handle_message, 0, handle_dmq_fixup, 0, - REQUEST_ROUTE}, - {"dmq_send_message", (cmd_function)cfg_dmq_send_message, 4, send_dmq_fixup, 0, - ANY_ROUTE}, - {"dmq_bcast_message", (cmd_function)cfg_dmq_bcast_message, 3, bcast_dmq_fixup, 0, - ANY_ROUTE}, - {"dmq_t_replicate", (cmd_function)cfg_dmq_t_replicate, 0, 0, 0, - REQUEST_ROUTE}, - {"dmq_t_replicate", (cmd_function)cfg_dmq_t_replicate, 1, fixup_spve_null, 0, - REQUEST_ROUTE}, - {"dmq_is_from_node", (cmd_function)cfg_dmq_is_from_node, 0, 0, 0, - REQUEST_ROUTE}, - {"bind_dmq", (cmd_function)bind_dmq, 0, 0, 0}, + {"dmq_handle_message", (cmd_function)dmq_handle_message, 0, + 0, 0, REQUEST_ROUTE}, + {"dmq_send_message", (cmd_function)cfg_dmq_send_message, 4, + fixup_spve_all, 0, ANY_ROUTE}, + {"dmq_bcast_message", (cmd_function)cfg_dmq_bcast_message, 3, + fixup_spve_all, 0, ANY_ROUTE}, + {"dmq_t_replicate", (cmd_function)cfg_dmq_t_replicate, 0, + 0, 0, REQUEST_ROUTE}, + {"dmq_t_replicate", (cmd_function)cfg_dmq_t_replicate, 1, + fixup_spve_null, 0, REQUEST_ROUTE}, + {"dmq_is_from_node", (cmd_function)cfg_dmq_is_from_node, 0, + 0, 0, REQUEST_ROUTE}, + {"bind_dmq", (cmd_function)bind_dmq, 0, + 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -329,21 +327,6 @@ static void destroy(void) { } } -static int handle_dmq_fixup(void** param, int param_no) -{ - return 0; -} - -static int send_dmq_fixup(void** param, int param_no) -{ - return fixup_spve_null(param, 1); -} - -static int bcast_dmq_fixup(void** param, int param_no) -{ - return fixup_spve_null(param, 1); -} - static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) { void *h;

1 0

git:master:ebf570f8: topos: update contact in branch record before sending response
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: ebf570f83c878363dfd1f53882de9a0f907f5971 URL: https://github.com/kamailio/kamailio/commit/ebf570f83c878363dfd1f53882de9a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T11:55:51+01:00 topos: update contact in branch record before sending response - might be updated in config execution - reported by GH #1339 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/ebf570f83c878363dfd1f53882de9a0… Patch: https://github.com/kamailio/kamailio/commit/ebf570f83c878363dfd1f53882de9a0… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 75b6d02078..26e25b42c0 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1081,6 +1081,9 @@ int tps_response_sent(sip_msg_t *msg) } tps_reappend_rr(msg, &btsd, &btsd.x_rr); + if(tps_storage_update_branch(msg, &mtsd, &btsd, TPS_DBU_CONTACT)<0) { + goto error; + } if(tps_storage_update_dialog(msg, &mtsd, &stsd, TPS_DBU_CONTACT)<0) { goto error1; }

1 0

git:master:04cfb066: nat_traversal: exported functions to kemi framework
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: 04cfb0662be9cc429e66b79545daf578993dab1f URL: https://github.com/kamailio/kamailio/commit/04cfb0662be9cc429e66b79545daf57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T11:23:00+01:00 nat_traversal: exported functions to kemi framework --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/04cfb0662be9cc429e66b79545daf57… Patch: https://github.com/kamailio/kamailio/commit/04cfb0662be9cc429e66b79545daf57… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index ab1e33442c..ead4c696fe 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -66,6 +66,7 @@ #include "../../core/parser/contact/parse_contact.h" #include "../../core/counters.h" #include "../../core/rand/kam_rand.h" +#include "../../core/kemi.h" #include "../dialog/dlg_load.h" #include "../../modules/tm/tm_load.h" #include "../../modules/sl/sl.h" @@ -204,9 +205,9 @@ typedef struct Keepalive_Params // Function prototypes // -static int NAT_Keepalive(struct sip_msg *msg); -static int FixContact(struct sip_msg *msg); -static int ClientNatTest(struct sip_msg *msg, unsigned int tests); +static int w_NAT_Keepalive(struct sip_msg *msg, char *p1, char *p2); +static int w_FixContact(struct sip_msg *msg, char *p1, char *p2); +static int w_ClientNatTest(struct sip_msg *msg, char *ptests, char *p2); static bool test_private_contact(struct sip_msg *msg); static bool test_source_address(struct sip_msg *msg); @@ -270,9 +271,12 @@ static NatTest NAT_Tests[] = { sl_api_t slb; static cmd_export_t commands[] = { - {"nat_keepalive", (cmd_function)NAT_Keepalive, 0, NULL, 0, REQUEST_ROUTE}, - {"fix_contact", (cmd_function)FixContact, 0, NULL, 0, ANY_ROUTE}, - {"client_nat_test", (cmd_function)ClientNatTest, 1, fixup_uint_null, 0, ANY_ROUTE}, + {"nat_keepalive", (cmd_function)w_NAT_Keepalive, 0, NULL, 0, + REQUEST_ROUTE}, + {"fix_contact", (cmd_function)w_FixContact, 0, NULL, 0, + ANY_ROUTE}, + {"client_nat_test", (cmd_function)w_ClientNatTest, 1, fixup_igp_null, 0, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -1462,6 +1466,10 @@ static int NAT_Keepalive(struct sip_msg *msg) } } +static int w_NAT_Keepalive(struct sip_msg *msg, char *p1, char *p2) +{ + return NAT_Keepalive(msg); +} // Replace IP:Port in Contact field with the source address of the packet. static int FixContact(struct sip_msg *msg) @@ -1534,8 +1542,12 @@ static int FixContact(struct sip_msg *msg) return 1; } +static int w_FixContact(struct sip_msg *msg, char *p1, char *p2) +{ + return FixContact(msg); +} -static int ClientNatTest(struct sip_msg *msg, unsigned int tests) +static int ClientNatTest(struct sip_msg *msg, int tests) { int i; @@ -1548,6 +1560,17 @@ static int ClientNatTest(struct sip_msg *msg, unsigned int tests) return -1; // all failed } +static int w_ClientNatTest(struct sip_msg *msg, char *ptests, char *p2) +{ + int tests; + + if(fixup_get_ivalue(msg, (gparam_t*)ptests, &tests)<0) { + LM_ERR("failed to get tests parameter\n"); + return -1; + } + + return ClientNatTest(msg, tests); +} #define FROM_PREFIX "sip:keepalive@" #define MAX_BRANCHID 9999999 @@ -2103,3 +2126,34 @@ static int pv_get_source_uri( return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_nat_traversal_exports[] = { + { str_init("nat_traversal"), str_init("nat_keepalive"), + SR_KEMIP_INT, NAT_Keepalive, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("nat_traversal"), str_init("fix_contact"), + SR_KEMIP_INT, FixContact, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("nat_traversal"), str_init("client_nat_test"), + SR_KEMIP_INT, ClientNatTest, + { SR_KEMIP_INT, 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 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_nat_traversal_exports); + return 0; +} \ No newline at end of file

1 0

git:master:3bad0073: nat_traversal: clang format the code
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: 3bad00732994813bc21c84d41342772783a5bddd URL: https://github.com/kamailio/kamailio/commit/3bad00732994813bc21c84d41342772… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T11:09:55+01:00 nat_traversal: clang format the code --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/3bad00732994813bc21c84d41342772… Patch: https://github.com/kamailio/kamailio/commit/3bad00732994813bc21c84d41342772…

1 0

git:master:95da4cda: misc_radius: exported functions to kemi framework
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: 95da4cda2c68ff25f7e14501a28cfe2ec0ebc50f URL: https://github.com/kamailio/kamailio/commit/95da4cda2c68ff25f7e14501a28cfe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T10:54:07+01:00 misc_radius: exported functions to kemi framework --- Modified: src/modules/misc_radius/functions.c Modified: src/modules/misc_radius/functions.h Modified: src/modules/misc_radius/misc_radius.c --- Diff: https://github.com/kamailio/kamailio/commit/95da4cda2c68ff25f7e14501a28cfe2… Patch: https://github.com/kamailio/kamailio/commit/95da4cda2c68ff25f7e14501a28cfe2…

1 0

Broken: kamailio/kamailio#5177 (master - f06e4d4)
by Travis CI 05 Dec '17

05 Dec '17

Build Update for kamailio/kamailio ------------------------------------- Build: #5177 Status: Broken Duration: 3 minutes and 55 seconds Commit: f06e4d4 (master) Author: Daniel-Constantin Mierla Message: misc_radius: use spve fixup helper instead of pvar - simplifies getting params View the changeset: https://github.com/kamailio/kamailio/compare/f283fe291917...f06e4d4b81e0 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/311735664?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:61335063: misc_radius: fixed accessing str* params after previous commit
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: 613350632c842c1775e1b5696b4cda4c96e5ba4c URL: https://github.com/kamailio/kamailio/commit/613350632c842c1775e1b5696b4cda4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T09:19:29+01:00 misc_radius: fixed accessing str* params after previous commit --- Modified: src/modules/misc_radius/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/613350632c842c1775e1b5696b4cda4… Patch: https://github.com/kamailio/kamailio/commit/613350632c842c1775e1b5696b4cda4… --- diff --git a/src/modules/misc_radius/functions.c b/src/modules/misc_radius/functions.c index c176084382..c10d3ce801 100644 --- a/src/modules/misc_radius/functions.c +++ b/src/modules/misc_radius/functions.c @@ -516,11 +516,11 @@ int radius_does_uri_user_host_exist(struct sip_msg *_m, str *user, str *host) } at = user_host; memcpy(at, user->s, user->len); - at += user.len; + at += user->len; *at = '@'; at++; memcpy(at, host->s, host->len); - at += host.len; + at += host->len; *at = '\0'; if(!rc_avpair_add( rh, &send, uri_attrs[SA_USER_NAME].v, user_host, -1, 0)) {

1 0

git:master:f06e4d4b: misc_radius: use spve fixup helper instead of pvar
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: f06e4d4b81e0df1009c3f2bbc54f0be1bb4a5d32 URL: https://github.com/kamailio/kamailio/commit/f06e4d4b81e0df1009c3f2bbc54f0be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T09:17:49+01:00 misc_radius: use spve fixup helper instead of pvar - simplifies getting params --- Modified: src/modules/misc_radius/functions.c Modified: src/modules/misc_radius/misc_radius.c --- Diff: https://github.com/kamailio/kamailio/commit/f06e4d4b81e0df1009c3f2bbc54f0be… Patch: https://github.com/kamailio/kamailio/commit/f06e4d4b81e0df1009c3f2bbc54f0be…

1 0

git:master:f283fe29: misc_radius: clang format the code
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: f283fe291917f67320061af3e35259859e448408 URL: https://github.com/kamailio/kamailio/commit/f283fe291917f67320061af3e352598… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T08:21:58+01:00 misc_radius: clang format the code --- Modified: src/modules/misc_radius/extra.c Modified: src/modules/misc_radius/extra.h Modified: src/modules/misc_radius/functions.c Modified: src/modules/misc_radius/functions.h Modified: src/modules/misc_radius/misc_radius.c Modified: src/modules/misc_radius/misc_radius.h Modified: src/modules/misc_radius/radius.h --- Diff: https://github.com/kamailio/kamailio/commit/f283fe291917f67320061af3e352598… Patch: https://github.com/kamailio/kamailio/commit/f283fe291917f67320061af3e352598…

1 0

git:master:cf043326: auth_radius: exported functions to kemi framework
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: cf043326abc792317335954fe75927f8294fa40e URL: https://github.com/kamailio/kamailio/commit/cf043326abc792317335954fe75927f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T16:54:52+01:00 auth_radius: exported functions to kemi framework --- Modified: src/modules/auth_radius/auth_radius.c Modified: src/modules/auth_radius/authorize.c Modified: src/modules/auth_radius/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/cf043326abc792317335954fe75927f… Patch: https://github.com/kamailio/kamailio/commit/cf043326abc792317335954fe75927f…

1 0

git:master:fe0c386c: auth_radius: use core fixup helper functions
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: fe0c386cebebbf6c68b598269ecdfc25bfe1bcc2 URL: https://github.com/kamailio/kamailio/commit/fe0c386cebebbf6c68b598269ecdfc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T16:03:52+01:00 auth_radius: use core fixup helper functions --- Modified: src/modules/auth_radius/auth_radius.c Modified: src/modules/auth_radius/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/fe0c386cebebbf6c68b598269ecdfc2… Patch: https://github.com/kamailio/kamailio/commit/fe0c386cebebbf6c68b598269ecdfc2…

1 0

git:master:7453fc5f: acc_radius: clang format the code
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: 7453fc5f8da8fed0941d5d8c759cec97e0647bfd URL: https://github.com/kamailio/kamailio/commit/7453fc5f8da8fed0941d5d8c759cec9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T15:50:06+01:00 acc_radius: clang format the code --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7453fc5f8da8fed0941d5d8c759cec9… Patch: https://github.com/kamailio/kamailio/commit/7453fc5f8da8fed0941d5d8c759cec9…

1 0

git:master:1c07ddb5: auth_radius: clang format the code
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: 1c07ddb50cf56ea9566effb8ff7ada3de8f1d48b URL: https://github.com/kamailio/kamailio/commit/1c07ddb50cf56ea9566effb8ff7ada3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T15:47:40+01:00 auth_radius: clang format the code --- Modified: src/modules/auth_radius/auth_radius.c Modified: src/modules/auth_radius/authorize.c Modified: src/modules/auth_radius/authorize.h Modified: src/modules/auth_radius/extra.c Modified: src/modules/auth_radius/extra.h Modified: src/modules/auth_radius/sterman.c Modified: src/modules/auth_radius/sterman.h --- Diff: https://github.com/kamailio/kamailio/commit/1c07ddb50cf56ea9566effb8ff7ada3… Patch: https://github.com/kamailio/kamailio/commit/1c07ddb50cf56ea9566effb8ff7ada3…

1 0

git:master:afbc1a70: acc_radius: functions exported to kemi framework
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: afbc1a7099eb59dcd8c11a202c9abb1bcf972751 URL: https://github.com/kamailio/kamailio/commit/afbc1a7099eb59dcd8c11a202c9abb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T13:09:03+01:00 acc_radius: functions exported to kemi framework --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/afbc1a7099eb59dcd8c11a202c9abb1… Patch: https://github.com/kamailio/kamailio/commit/afbc1a7099eb59dcd8c11a202c9abb1… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index 94e521f537..8e3c4482d4 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -41,6 +41,7 @@ #include "../../core/dprint.h" #include "../../core/mem/mem.h" #include "../../core/parser/parse_to.h" +#include "../../core/kemi.h" #include "../misc_radius/radius.h" #include "../../modules/acc/acc_api.h" #include "acc_radius_mod.h" @@ -444,3 +445,84 @@ static int w_acc_radius_request(struct sip_msg *rq, char *comment, char *foo) return accb.exec(rq, &_acc_radius_engine, (acc_param_t*)comment); } +static int acc_radius_parse_code(char *p, acc_param_t *param) +{ + if (p==NULL||param==NULL) + return -1; + + /* any code? */ + if (param->reason.len>=3 && isdigit((int)p[0]) + && isdigit((int)p[1]) && isdigit((int)p[2]) ) { + param->code = (p[0]-'0')*100 + (p[1]-'0')*10 + (p[2]-'0'); + param->code_s.s = p; + param->code_s.len = 3; + param->reason.s += 3; + for( ; isspace((int)param->reason.s[0]) ; param->reason.s++ ); + param->reason.len = strlen(param->reason.s); + } + return 0; +} + +/** + * + */ +static int acc_radius_param_parse(str *s, acc_param_t *accp) +{ + if(s==NULL || s->s==NULL || s->len<=0 || accp==NULL) { + LM_ERR("invalid parameters\n"); + return -1; + } + memset(accp, 0, sizeof(acc_param_t)); + accp->reason.s = s->s; + accp->reason.len = s->len; + if (strchr(s->s, PV_MARKER)!=NULL) { + /* there is a cfg variable - not through kemi */ + LM_ERR("cfg variable detected - not supported\n"); + return -1; + } else { + if(acc_radius_parse_code(s->s, accp)<0) { + LM_ERR("failed to parse: [%.*s] (expected [code text])\n", + s->len, s->s); + return -1; + } + } + return 0; +} + +/** + * + */ +static int ki_acc_radius_request(sip_msg_t *rq, str *comment) +{ + acc_param_t accp; + + if(acc_radius_param_parse(comment, &accp)<0) { + LM_ERR("failed to parse parameter\n"); + return -1; + } + return accb.exec(rq, &_acc_radius_engine, &accp); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_acc_radius_exports[] = { + { str_init("acc_radius"), str_init("request"), + SR_KEMIP_INT, ki_acc_radius_request, + { SR_KEMIP_STR, 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 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_acc_radius_exports); + return 0; +}

1 0

git:5.0:782b76b4: jansson: fix the include guard in header file
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.0 Commit: 782b76b40672075756348297bea61d2d38f96022 URL: https://github.com/kamailio/kamailio/commit/782b76b40672075756348297bea61d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T12:55:47+01:00 jansson: fix the include guard in header file (cherry picked from commit d17a48c186b0b8066518db2106037fe925846d2e) (cherry picked from commit 90b1b0e1f00f72dcac7f7ef1c734ea43afd1cd83) --- Modified: src/modules/jansson/jansson_path.h --- Diff: https://github.com/kamailio/kamailio/commit/782b76b40672075756348297bea61d2… Patch: https://github.com/kamailio/kamailio/commit/782b76b40672075756348297bea61d2… --- diff --git a/src/modules/jansson/jansson_path.h b/src/modules/jansson/jansson_path.h index 9aefb49a00..b31050702d 100644 --- a/src/modules/jansson/jansson_path.h +++ b/src/modules/jansson/jansson_path.h @@ -2,12 +2,12 @@ * Copyright (c) 2012 Rogerz Zhang <rogerz.zhang(a)gmail.com> * * Jansson is free software; you can redistribute it and/or modify - * it under the terms of the MIT license. + * it under the terms of the MIT license. */ -#ifndef _JANSSON_FUNCS_H_ -#define _JANSSON_FUNCS_H_ +#ifndef _JANSSON_PATH_H_ +#define _JANSSON_PATH_H_ #include <jansson.h> json_t *json_path_get(const json_t *json, const char *path);

1 0

git:5.1:90b1b0e1: jansson: fix the include guard in header file
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 90b1b0e1f00f72dcac7f7ef1c734ea43afd1cd83 URL: https://github.com/kamailio/kamailio/commit/90b1b0e1f00f72dcac7f7ef1c734ea4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T12:54:54+01:00 jansson: fix the include guard in header file (cherry picked from commit d17a48c186b0b8066518db2106037fe925846d2e) --- Modified: src/modules/jansson/jansson_path.h --- Diff: https://github.com/kamailio/kamailio/commit/90b1b0e1f00f72dcac7f7ef1c734ea4… Patch: https://github.com/kamailio/kamailio/commit/90b1b0e1f00f72dcac7f7ef1c734ea4… --- diff --git a/src/modules/jansson/jansson_path.h b/src/modules/jansson/jansson_path.h index 9aefb49a00..b31050702d 100644 --- a/src/modules/jansson/jansson_path.h +++ b/src/modules/jansson/jansson_path.h @@ -2,12 +2,12 @@ * Copyright (c) 2012 Rogerz Zhang <rogerz.zhang(a)gmail.com> * * Jansson is free software; you can redistribute it and/or modify - * it under the terms of the MIT license. + * it under the terms of the MIT license. */ -#ifndef _JANSSON_FUNCS_H_ -#define _JANSSON_FUNCS_H_ +#ifndef _JANSSON_PATH_H_ +#define _JANSSON_PATH_H_ #include <jansson.h> json_t *json_path_get(const json_t *json, const char *path);

1 0

git:master:d17a48c1: jansson: fix the include guard in header file
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: d17a48c186b0b8066518db2106037fe925846d2e URL: https://github.com/kamailio/kamailio/commit/d17a48c186b0b8066518db2106037fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T12:49:41+01:00 jansson: fix the include guard in header file --- Modified: src/modules/jansson/jansson_path.h --- Diff: https://github.com/kamailio/kamailio/commit/d17a48c186b0b8066518db2106037fe… Patch: https://github.com/kamailio/kamailio/commit/d17a48c186b0b8066518db2106037fe… --- diff --git a/src/modules/jansson/jansson_path.h b/src/modules/jansson/jansson_path.h index 9aefb49a00..b31050702d 100644 --- a/src/modules/jansson/jansson_path.h +++ b/src/modules/jansson/jansson_path.h @@ -2,12 +2,12 @@ * Copyright (c) 2012 Rogerz Zhang <rogerz.zhang(a)gmail.com> * * Jansson is free software; you can redistribute it and/or modify - * it under the terms of the MIT license. + * it under the terms of the MIT license. */ -#ifndef _JANSSON_FUNCS_H_ -#define _JANSSON_FUNCS_H_ +#ifndef _JANSSON_PATH_H_ +#define _JANSSON_PATH_H_ #include <jansson.h> json_t *json_path_get(const json_t *json, const char *path);

1 0

git:5.1:cd8a9d42: pkg/kamailio/deb: version set to 5.1.0~rc3
by Victor Seva 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: cd8a9d4225d95a358fc901ebec58ee0aa83aecbb URL: https://github.com/kamailio/kamailio/commit/cd8a9d4225d95a358fc901ebec58ee0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-04T11:40:36+01:00 pkg/kamailio/deb: version set to 5.1.0~rc3 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/cd8a9d4225d95a358fc901ebec58ee0… Patch: https://github.com/kamailio/kamailio/commit/cd8a9d4225d95a358fc901ebec58ee0… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index ffe4d96e9a..5e3dfe07e0 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc3) unstable; urgency=medium + + * version set to 5.1.0~rc3 + + -- Victor Seva <vseva(a)debian.org> Mon, 04 Dec 2017 11:38:41 +0100 + kamailio (5.1.0~rc2) unstable; urgency=medium * version set to 5.1.0~rc2

1 0

Multiple memleaks and segfauts in Kamailio v5.0.4
by M S 04 Dec '17

04 Dec '17

Hi, I have kamailio v5.0.4 git rev. 5f26a4e8c55cdf5a5a7eaf6864c4f5213d321293 installed on 32bit Debian Wheezy virtual machine (1GB RAM and 1 vCPU) for development and testing of a project. We need to inspect sip traces to / from webrtc endpoint on kamailio side, for which we use siptrace module with following config, # ----- siptrace params ----- modparam("siptrace", "trace_on", 1) modparam("siptrace", "hep_mode_on", 0) modparam("siptrace", "xheaders_write", 1) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "trace_flag", FLT_SIP_TRACE) modparam("siptrace", "traced_user_avp", "$avp(traced_user)") modparam("siptrace", "duplicate_uri", "WEBRTC_SIP_TRACE_ADDRESS") We observed multiple problems of memleaks and segfaults, here is a summary, 1. Calling sip_trace method without any arguements or with only one arguement (duplicate uri) crashes kamailio with segfault. https://kamailio.org/docs/modules/5.0.x/modules/siptrace.html#siptrace.f.si… 2. To avoid segfault, either I have to specify both args (i am not sure what to set as 2nd arg, so i used "$ci" for it) OR disable "xheaders_write" module param. However, this causes slow memory leak and in about 48 hours kamailio runs out of memory (sip traffic is less then 10 concurrent users) https://kamailio.org/docs/modules/5.0.x/modules/siptrace.html#siptrace.p.xh… 3. If we remove siptrace module and use "network:msg" event route in corex module with "send_data" method then we ran in to PV buffer overflow problem (webrtc invites are very big > 10KB). So, I increased "pv_buffer_size" to 16K and "pv_buffer_slots" to 12. Which again crashes kamailio with segfault. https://kamailio.org/docs/modules/5.0.x/modules/corex.html#async.evr.networ… https://kamailio.org/docs/modules/5.0.x/modules/corex.html#corex.f.send_data http://www.kamailio.org/wiki/cookbooks/4.1.x/core#pv_buffer_size http://www.kamailio.org/wiki/cookbooks/4.1.x/core#pv_buffer_slots Removing "pv_buffer_slots" from config fixes the crash problem, and right now we are observing kamailio if stays stable. Thank you.

3 6

git:5.0:2ad024fb: core: pv - use active values for pv buffer slots and size
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.0 Commit: 2ad024fb3e38823af8668d73d0a64be1f18697f3 URL: https://github.com/kamailio/kamailio/commit/2ad024fb3e38823af8668d73d0a64be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:42:37+01:00 core: pv - use active values for pv buffer slots and size - during startup, param value and active can be different, up to the moment when the config is completely loaded (cherry picked from commit a156c625b434dc0bc19c43ece524f90b1179d881) (cherry picked from commit 3929986622b502660b870916bcd7f015282a6a1c) --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/2ad024fb3e38823af8668d73d0a64be… Patch: https://github.com/kamailio/kamailio/commit/2ad024fb3e38823af8668d73d0a64be… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 7e3d7b9b4b..97c23df539 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2032,7 +2032,8 @@ char* pv_get_buffer(void) char *p; p = _pv_print_buffer[_pv_print_buffer_index]; - _pv_print_buffer_index = (_pv_print_buffer_index+1)%_pv_print_buffer_slots; + _pv_print_buffer_index = (_pv_print_buffer_index+1) + % _pv_print_buffer_slots_active; return p; } @@ -2042,7 +2043,7 @@ char* pv_get_buffer(void) */ int pv_get_buffer_size(void) { - return _pv_print_buffer_size; + return _pv_print_buffer_size_active; } /** @@ -2050,7 +2051,7 @@ int pv_get_buffer_size(void) */ int pv_get_buffer_slots(void) { - return _pv_print_buffer_slots; + return _pv_print_buffer_slots_active; } /**

1 0

git:5.1:cc11eac3: Makefile.defs: version set to 5.1.0-rc3
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: cc11eac314b6611285665dd5d15310b56a61e28c URL: https://github.com/kamailio/kamailio/commit/cc11eac314b6611285665dd5d15310b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:33:01+01:00 Makefile.defs: version set to 5.1.0-rc3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/cc11eac314b6611285665dd5d15310b… Patch: https://github.com/kamailio/kamailio/commit/cc11eac314b6611285665dd5d15310b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 4ad22ca7ff..df5ad7b8ff 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.1:39299866: core: pv - use active values for pv buffer slots and size
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 3929986622b502660b870916bcd7f015282a6a1c URL: https://github.com/kamailio/kamailio/commit/3929986622b502660b870916bcd7f01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:27:09+01:00 core: pv - use active values for pv buffer slots and size - during startup, param value and active can be different, up to the moment when the config is completely loaded (cherry picked from commit a156c625b434dc0bc19c43ece524f90b1179d881) --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/3929986622b502660b870916bcd7f01… Patch: https://github.com/kamailio/kamailio/commit/3929986622b502660b870916bcd7f01… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 0e4d4d326f..64b9fd96ff 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2105,7 +2105,8 @@ char* pv_get_buffer(void) char *p; p = _pv_print_buffer[_pv_print_buffer_index]; - _pv_print_buffer_index = (_pv_print_buffer_index+1)%_pv_print_buffer_slots; + _pv_print_buffer_index = (_pv_print_buffer_index+1) + % _pv_print_buffer_slots_active; return p; } @@ -2115,7 +2116,7 @@ char* pv_get_buffer(void) */ int pv_get_buffer_size(void) { - return _pv_print_buffer_size; + return _pv_print_buffer_size_active; } /** @@ -2123,7 +2124,7 @@ int pv_get_buffer_size(void) */ int pv_get_buffer_slots(void) { - return _pv_print_buffer_slots; + return _pv_print_buffer_slots_active; } /**

1 0

git:5.1:83612695: test/unit: 3.sh - updates for using db root password with kamdbctl
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 83612695acc49fae39d0abf8376747618a694012 URL: https://github.com/kamailio/kamailio/commit/83612695acc49fae39d0abf83767476… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:26:43+01:00 test/unit: 3.sh - updates for using db root password with kamdbctl (cherry picked from commit f5ea35bc424f34c64ee71a745db93326f597c4a1) --- Modified: test/unit/3.sh --- Diff: https://github.com/kamailio/kamailio/commit/83612695acc49fae39d0abf83767476… Patch: https://github.com/kamailio/kamailio/commit/83612695acc49fae39d0abf83767476… --- diff --git a/test/unit/3.sh b/test/unit/3.sh index 03c98b04fb..4b039ba9b0 100755 --- a/test/unit/3.sh +++ b/test/unit/3.sh @@ -20,10 +20,10 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Needs a mysql database, the root user password must be assigned to -# the 'PW' variable in the file 'dbrootpw' in the test directory, e.g.: -# PW=sql_root_passwd +# the 'DBROOTPW' variable in the file 'dbrootpw' in the test directory, e.g.: +# DBROOTPW=sql_root_passwd # If MySQL root password is empty, add in the file the line: -# PWSKIP=yes +# DBROOTPWSKIP=yes . include/common @@ -50,13 +50,13 @@ sed -i '' -e "s/TEST=\"false\"/TEST=\"true\"/g" $DBCTL # set the mysql root password cp $DBCTL.mysql $DBCTL.mysql.bak -sed -i '' -e "s/#PW=\"\"/PW=\"$PW\"/g" $DBCTL.mysql +sed -i '' -e "s/#DBROOTPW=\"\"/DBROOTPW=\"$DBROOTPW\"/g" $DBCTL.mysql -PWSKIP="$PWSKIP" CHARSET="latin1" ./$DBCTL create $tmp_name > /dev/null +DBROOTPWSKIP="$DBROOTPWSKIP" CHARSET="latin1" ./$DBCTL create $tmp_name > /dev/null ret=$? if [ "$ret" -eq 0 ] ; then - PWSKIP="$PWSKIP" ./$DBCTL drop $tmp_name > /dev/null + DBROOTPWSKIP="$DBROOTPWSKIP" ./$DBCTL drop $tmp_name > /dev/null ret=$? fi ;

1 0

git:5.1:5aff4422: core: fix setting pv_cache_limit param
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 5aff4422815f6842d8ecfd028451a13be22d7374 URL: https://github.com/kamailio/kamailio/commit/5aff4422815f6842d8ecfd028451a13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:26:58+01:00 core: fix setting pv_cache_limit param (cherry picked from commit ef7398589aaff02d6521171ff569726db6996c6a) --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/5aff4422815f6842d8ecfd028451a13… Patch: https://github.com/kamailio/kamailio/commit/5aff4422815f6842d8ecfd028451a13… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 4548d321f9..85105120b7 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1556,11 +1556,11 @@ assign_stm: | MAX_WLOOPS EQUAL error { yyerror("number expected"); } | PVBUFSIZE EQUAL NUMBER { pv_set_buffer_size($3); } | PVBUFSIZE EQUAL error { yyerror("number expected"); } - | PVBUFSLOTS EQUAL NUMBER { default_core_cfg.pv_cache_limit=$3; } + | PVBUFSLOTS EQUAL NUMBER { pv_set_buffer_slots($3); } | PVBUFSLOTS EQUAL error { yyerror("number expected"); } - | PVCACHELIMIT EQUAL NUMBER { default_core_cfg.pv_cache_action=$3; } + | PVCACHELIMIT EQUAL NUMBER { default_core_cfg.pv_cache_limit=$3; } | PVCACHELIMIT EQUAL error { yyerror("number expected"); } - | PVCACHEACTION EQUAL NUMBER { pv_set_buffer_slots($3); } + | PVCACHEACTION EQUAL NUMBER { default_core_cfg.pv_cache_action=$3; } | PVCACHEACTION EQUAL error { yyerror("number expected"); } | HTTP_REPLY_PARSE EQUAL NUMBER { http_reply_parse=$3; } | HTTP_REPLY_PARSE EQUAL error { yyerror("boolean value expected"); }

1 0

git:5.1:ec7d89da: kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: ec7d89da1cce4060969b4a7bd7db64ffa23c1b3d URL: https://github.com/kamailio/kamailio/commit/ec7d89da1cce4060969b4a7bd7db64f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:26:33+01:00 kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc - DBROOTPW can be now set in kamctlrc - targeting use for automatic testing (cherry picked from commit 313805136d22ed79d1c4900753247032240d5a5b) --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/ec7d89da1cce4060969b4a7bd7db64f… Patch: https://github.com/kamailio/kamailio/commit/ec7d89da1cce4060969b4a7bd7db64f… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 6ac3cd4c2e..46fcdf5664 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -47,6 +47,11 @@ ## database super user (for ORACLE this is 'scheme-creator' user) # DBROOTUSER="root" +## password for database super user +## - important: this is insecure, targeting the use only for automatic testing +## - known to work for: mysql +# DBROOTPW="dbrootpw" + ## database character set (used by MySQL when creating database) #CHARSET="latin1" diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 8d090fc7fe..422eed8beb 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -32,10 +32,10 @@ if [ -z "$DBROOTUSER" ]; then DBROOTUSER="root" fi -# Uncomment this to set the database root password if you want to run this -# script without any user prompt. This is unsafe, but useful e.g. for -# automatic testing. -#PW="" +# Set DBROOTPW in kamctlrc or via next line to set the database +# root password if you want to run this script without any user prompt. +# This is unsafe, but useful e.g. for automatic testing. +#DBROOTPW="" if [ -z "$DBPORT" ] ; then @@ -55,13 +55,13 @@ prompt_pw() savetty=`stty -g` echo -n "MySQL password for $DBROOTUSER: " stty -echo - read PW + read DBROOTPW stty $savetty echo - export PW + export DBROOTPW } -# execute sql command with optional db name +# execute sql command with optional db name # and password parameters given sql_query() { @@ -72,14 +72,14 @@ sql_query() DB="" fi shift - if [ -n "$PW" ]; then - $CMD "-p$PW" $DB -e "$@" + if [ -n "$DBROOTPW" ]; then + $CMD "-p$DBROOTPW" $DB -e "$@" else $CMD $DB -e "$@" fi else - if [ -n "$PW" ]; then - $CMD "-p$PW" "$@" + if [ -n "$DBROOTPW" ]; then + $CMD "-p$DBROOTPW" "$@" else $CMD "$@" fi @@ -106,9 +106,9 @@ kamailio_drop() # pars: <database name> db_charset_test() { - if [ -n "$PW" ]; then - CURRCHARSET=`echo "show variables like '%character_set_server%'" | $CMD "-p$PW" | $AWK '{print $2}' | $SED -e 1d` - ALLCHARSETS=`echo "show character set" | $CMD "-p$PW" | $AWK '{print $1}' | $SED -e 1d | $GREP -iv -e "utf8\|ucs2"` + if [ -n "$DBROOTPW" ]; then + CURRCHARSET=`echo "show variables like '%character_set_server%'" | $CMD "-p$DBROOTPW" | $AWK '{print $2}' | $SED -e 1d` + ALLCHARSETS=`echo "show character set" | $CMD "-p$DBROOTPW" | $AWK '{print $1}' | $SED -e 1d | $GREP -iv -e "utf8\|ucs2"` else CURRCHARSET=`echo "show variables like '%character_set_server%'" | $CMD | $AWK '{print $2}' | $SED -e 1d` ALLCHARSETS=`echo "show character set" | $CMD | $AWK '{print $1}' | $SED -e 1d | $GREP -iv -e "utf8\|ucs2"` @@ -386,7 +386,7 @@ migrate_table () # 4 paremeters (dst_table, dst_cols, src_table, src_cols) if [ $? -ne 0 ] ; then echo $X | $GREP "ERROR 1146" > /dev/null - if [ $? -eq 0 ] ; then + if [ $? -eq 0 ] ; then echo " -- Migrating $3 to $1.....SKIPPED (no source)" return 0 fi @@ -540,9 +540,9 @@ fi } #end migrate_db() -export PW -if [ "$#" -ne 0 ] && [ "$PW" = "" ]; then - if [ "$PWSKIP" = "" ]; then +export DBROOTPW +if [ "$#" -ne 0 ] && [ "$DBROOTPW" = "" ]; then + if [ "$DBROOTPWSKIP" = "" ]; then prompt_pw fi fi

1 0

git:5.1:b243f760: test/unit: 24.sh - removed invalid comment about mysql
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: b243f7605e25b4467c72f85bb10159af5bfa38ed URL: https://github.com/kamailio/kamailio/commit/b243f7605e25b4467c72f85bb10159a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:26:23+01:00 test/unit: 24.sh - removed invalid comment about mysql (cherry picked from commit ebe117cae681c373a3e9f32e3fb392e31605039f) --- Modified: test/unit/24.sh --- Diff: https://github.com/kamailio/kamailio/commit/b243f7605e25b4467c72f85bb10159a… Patch: https://github.com/kamailio/kamailio/commit/b243f7605e25b4467c72f85bb10159a… --- diff --git a/test/unit/24.sh b/test/unit/24.sh index 196bb9df2a..cc85017493 100755 --- a/test/unit/24.sh +++ b/test/unit/24.sh @@ -19,9 +19,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Needs a mysql database, the root user password must be given -# in the file 'dbrootpw' in the test directory - . include/common if [ ! -f ~/.pgpass ] ; then

1 0

git:5.1:dab49483: ndb_redis: detect argument specifiers for redis_cmd() with three params
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: dab49483e419dd810c7b5133bf64063df0ad6696 URL: https://github.com/kamailio/kamailio/commit/dab49483e419dd810c7b5133bf64063… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:26:00+01:00 ndb_redis: detect argument specifiers for redis_cmd() with three params - check if %s or %d is part of the command, because it makes the redis api expect more params to the commands and can crash if none is found - reported by GH #1342 (cherry picked from commit 75bbbe4059cb6fde4c74fa9157f400a24e6f7496) --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dab49483e419dd810c7b5133bf64063… Patch: https://github.com/kamailio/kamailio/commit/dab49483e419dd810c7b5133bf64063… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 64f2b46897..e984a902bd 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -177,6 +177,7 @@ static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres) { str s[3]; + int i; if(fixup_get_svalue(msg, (gparam_t*)ssrv, &s[0])!=0) { @@ -188,6 +189,14 @@ static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, LM_ERR("no redis command\n"); return -1; } + for(i=0; i<s[1].len-1; i++) { + if(s[1].s[i]=='%') { + if(s[1].s[i+1]=='s' || s[1].s[i+1]=='b') { + LM_ERR("command argument specifier found, but no params\n"); + return -1; + } + } + } if(fixup_get_svalue(msg, (gparam_t*)sres, &s[2])!=0) { LM_ERR("no redis reply name\n"); @@ -928,6 +937,19 @@ int bind_ndb_redis(ndb_redis_api_t *api) */ static int ki_redis_cmd(sip_msg_t *msg, str *srv, str *rcmd, str *sres) { + int i; + if(rcmd==NULL || rcmd->s==NULL) { + LM_ERR("invalid command\n"); + return -1; + } + for(i=0; i<rcmd->len-1; i++) { + if(rcmd->s[i]=='%') { + if(rcmd->s[i+1]=='s' || rcmd->s[i+1]=='b') { + LM_ERR("command argument specifier found, but no params\n"); + return -1; + } + } + } return redisc_exec(srv, sres, rcmd); } @@ -1007,4 +1029,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_ndb_redis_exports); return 0; -} \ No newline at end of file +}

1 0

git:5.1:26bd009c: mtree: use cast to unsigned char for accessing _mt_char_table array
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 26bd009c4963e4acb1e0eb52d0f5c9f17096d412 URL: https://github.com/kamailio/kamailio/commit/26bd009c4963e4acb1e0eb52d0f5c9f… Author: Timo Teras <timo.teras(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:26:12+01:00 mtree: use cast to unsigned char for accessing _mt_char_table array - switched the index from unsigned int to unsigned char - simplifies the code by avoiding the tests for exceeding the size of the array - error message extended to print the full string - slightly modified version of PR #1343 (cherry picked from commit ae18e409d71d2d4eccb4604bb6f29a121309b54e) --- Modified: src/modules/mtree/mtree.c --- Diff: https://github.com/kamailio/kamailio/commit/26bd009c4963e4acb1e0eb52d0f5c9f… Patch: https://github.com/kamailio/kamailio/commit/26bd009c4963e4acb1e0eb52d0f5c9f…

1 0

git:5.1:1007b74b: ldap: use core fixup function for ldap_search()
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 1007b74b66267c31d12b60c53b231e73e74b0931 URL: https://github.com/kamailio/kamailio/commit/1007b74b66267c31d12b60c53b231e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:25:33+01:00 ldap: use core fixup function for ldap_search() (cherry picked from commit 209032fc134afb90e4e12b194d1368ed9fb67ee9) --- Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1007b74b66267c31d12b60c53b231e7… Patch: https://github.com/kamailio/kamailio/commit/1007b74b66267c31d12b60c53b231e7… --- diff --git a/src/modules/ldap/ldap_exp_fn.c b/src/modules/ldap/ldap_exp_fn.c index 77a92c2bf7..c68e00895e 100644 --- a/src/modules/ldap/ldap_exp_fn.c +++ b/src/modules/ldap/ldap_exp_fn.c @@ -52,31 +52,22 @@ static char esc_buf[ESC_BUF_SIZE]; * exported functions */ -int ldap_search_impl(struct sip_msg *_msg, pv_elem_t *_ldap_url) +int ldap_search_impl(struct sip_msg *_msg, str *ldap_url) { - str ldap_url; int ld_result_count = 0; /* * do variable substitution for _ldap_url (pv_printf_s) */ - if(_ldap_url == NULL) { + if(ldap_url == NULL || ldap_url->s==NULL || ldap_url->len<=0) { LM_ERR("empty ldap_url\n"); return -2; } - if(_ldap_url->spec != NULL && _ldap_url->spec->getf != NULL) { - if(pv_printf_s(_msg, _ldap_url, &ldap_url) != 0 || ldap_url.len <= 0) { - LM_ERR("pv_printf_s failed\n"); - return -2; - } - } else { - ldap_url = _ldap_url->text; - } /* * perform LDAP search */ - if(ldap_url_search(ldap_url.s, &ld_result_count) != 0) { + if(ldap_url_search(ldap_url->s, &ld_result_count) != 0) { /* LDAP search error */ return -2; } diff --git a/src/modules/ldap/ldap_exp_fn.h b/src/modules/ldap/ldap_exp_fn.h index 695dbc198e..20d4149de6 100644 --- a/src/modules/ldap/ldap_exp_fn.h +++ b/src/modules/ldap/ldap_exp_fn.h @@ -47,7 +47,7 @@ struct ldap_result_check_params pv_elem_p check_str_elem_p; }; -int ldap_search_impl(struct sip_msg *_msg, pv_elem_t *_ldap_url); +int ldap_search_impl(struct sip_msg *_msg, str *ldap_url); int ldap_write_result(struct sip_msg *_msg, struct ldap_result_params *_lrp, struct subst_expr *_se); diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index f167bcadbb..2364f0a7cf 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -33,6 +33,7 @@ #include "../../core/parser/hf.h" #include "../../core/sr_module.h" #include "../../core/pvar.h" +#include "../../core/mod_fix.h" #include "../../core/mem/mem.h" #include "ld_session.h" @@ -54,7 +55,6 @@ static int child_init(int rank); /* * fixup functions */ -static int ldap_search_fixup(void **param, int param_no); static int ldap_result_fixup(void **param, int param_no); static int ldap_filter_url_encode_fixup(void **param, int param_no); static int ldap_result_check_fixup(void **param, int param_no); @@ -92,7 +92,7 @@ static dictionary *config_vals = NULL; /* clang-format off */ static cmd_export_t cmds[] = { {"ldap_search", (cmd_function)w_ldap_search, 1, - ldap_search_fixup, 0, + fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result1, 1, ldap_result_fixup, 0, @@ -246,7 +246,13 @@ static void destroy(void) static int w_ldap_search(struct sip_msg *msg, char *ldap_url, char *param) { - return ldap_search_impl(msg, (pv_elem_t *)ldap_url); + str ldap_url_val = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)ldap_url, &ldap_url_val)<0) { + LM_ERR("failed to get ldap url parameter\n"); + return -1; + } + return ldap_search_impl(msg, &ldap_url_val); } static int w_ldap_result1(struct sip_msg *msg, char *src, char *param) @@ -291,28 +297,6 @@ static int w_ldap_result_check_2( * FIXUP functions */ -static int ldap_search_fixup(void **param, int param_no) -{ - pv_elem_t *model; - str s; - - if(param_no == 1) { - s.s = (char *)*param; - s.len = strlen(s.s); - if(s.len == 0) { - LM_ERR("ldap url is empty string!\n"); - return E_CFG; - } - if(pv_parse_format(&s, &model) || model == NULL) { - LM_ERR("wrong format [%s] for ldap url!\n", s.s); - return E_CFG; - } - *param = (void *)model; - } - - return 0; -} - static int ldap_result_fixup(void **param, int param_no) { struct ldap_result_params *lp;

1 0

git:5.1:68f2d708: ldap: clang format the code
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 68f2d70858bca7ec3ba373dc4716e342c1c8e522 URL: https://github.com/kamailio/kamailio/commit/68f2d70858bca7ec3ba373dc4716e34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:25:23+01:00 ldap: clang format the code (cherry picked from commit 855d5d0f976e89962c541a34690dcb212e127e6b) --- Modified: src/modules/ldap/api.h Modified: src/modules/ldap/iniparser.c Modified: src/modules/ldap/iniparser.h Modified: src/modules/ldap/ld_session.c Modified: src/modules/ldap/ld_session.h Modified: src/modules/ldap/ldap_api_fn.c Modified: src/modules/ldap/ldap_api_fn.h Modified: src/modules/ldap/ldap_connect.c Modified: src/modules/ldap/ldap_connect.h Modified: src/modules/ldap/ldap_escape.c Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/68f2d70858bca7ec3ba373dc4716e34… Patch: https://github.com/kamailio/kamailio/commit/68f2d70858bca7ec3ba373dc4716e34…

1 0

git:5.1:b529300c: tcpops: exported functions to kemi framework
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: b529300cc809ddecc58b35d347cfc3973e7980de URL: https://github.com/kamailio/kamailio/commit/b529300cc809ddecc58b35d347cfc39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:25:14+01:00 tcpops: exported functions to kemi framework (cherry picked from commit 9f353bad0036f602e4f1ec39096658c1c7809a9b) --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b529300cc809ddecc58b35d347cfc39… Patch: https://github.com/kamailio/kamailio/commit/b529300cc809ddecc58b35d347cfc39…

1 0

git:5.1:1de066ee: core: timer - use uint type instead of short for flags and slow index
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 1de066ee6e6360056dad4c6d19b3413f26e4759c URL: https://github.com/kamailio/kamailio/commit/1de066ee6e6360056dad4c6d19b3413… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:25:02+01:00 core: timer - use uint type instead of short for flags and slow index - get rid of unused padding field (cherry picked from commit 3d22063ebd4cfa8b54ec3e83a04e92770c6d7319) --- Modified: src/core/timer.c Modified: src/core/timer.h --- Diff: https://github.com/kamailio/kamailio/commit/1de066ee6e6360056dad4c6d19b3413… Patch: https://github.com/kamailio/kamailio/commit/1de066ee6e6360056dad4c6d19b3413… --- diff --git a/src/core/timer.c b/src/core/timer.c index 3a4e610f3e..0e0dc8812e 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -530,7 +530,7 @@ static inline int _timer_add(ticks_t t, struct timer_ln* tl) ticks_t delta; #ifdef USE_SLOW_TIMER - tl->flags&=~((unsigned short)F_TIMER_ON_SLOW_LIST); + tl->flags&=~(F_TIMER_ON_SLOW_LIST); tl->slow_idx=0; #endif delta=tl->initial_timeout; diff --git a/src/core/timer.h b/src/core/timer.h index 6414fb106b..3b1669ab19 100644 --- a/src/core/timer.h +++ b/src/core/timer.h @@ -52,7 +52,7 @@ #ifdef USE_SLOW_TIMER #include <sys/types.h> -typedef unsigned short slow_idx_t; /* type fot the slow index */ +typedef unsigned int slow_idx_t; /* type fot the slow index */ extern pid_t slow_timer_pid; #endif @@ -102,11 +102,9 @@ struct timer_ln{ /* timer_link already used in tm */ ticks_t initial_timeout; void* data; timer_handler_f* f; - volatile unsigned short flags; + volatile unsigned int flags; #ifdef USE_SLOW_TIMER volatile slow_idx_t slow_idx; -#else - unsigned short reserved; #endif #ifdef TIMER_DEBUG unsigned int expires_no; /* timer handler calls */ @@ -144,15 +142,13 @@ void timer_free(struct timer_ln* t); /* use for a deleted/expired timer that you want to add again */ #define timer_reinit(tl) \ do{ \ - (tl)->flags&=~((unsigned short)(F_TIMER_ON_SLOW_LIST | \ - F_TIMER_ACTIVE));\ + (tl)->flags&=~(F_TIMER_ON_SLOW_LIST | F_TIMER_ACTIVE);\ (tl)->init++; \ }while(0) #else /* use for a deleted/expired timer that you want to add again */ #define timer_reinit(tl) \ - (tl)->flags&=~((unsigned short)(F_TIMER_ON_SLOW_LIST | \ - F_TIMER_ACTIVE)) + (tl)->flags&=~(F_TIMER_ON_SLOW_LIST | F_TIMER_ACTIVE) #endif #define timer_init(tl, fun, param, flgs) \

1 0

git:5.1:d6da4789: cnxcc: removed unused variable
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: d6da47896040ebf82ff5f0b6d31cd7e662216f5f URL: https://github.com/kamailio/kamailio/commit/d6da47896040ebf82ff5f0b6d31cd7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:24:48+01:00 cnxcc: removed unused variable (cherry picked from commit 7bdf8f003bbf5e153d7835d09533c7e22377e8db) --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d6da47896040ebf82ff5f0b6d31cd7e… Patch: https://github.com/kamailio/kamailio/commit/d6da47896040ebf82ff5f0b6d31cd7e… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index e77345d745..2cd8a87c6a 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -1755,7 +1755,6 @@ static int __get_channel_count_helper(sip_msg_t *msg, str *sclient, static int __get_channel_count(sip_msg_t *msg, char *pclient, char *pcount) { - pv_spec_t *pvcount = (pv_spec_t *)pcount; str sclient; if(fixup_get_svalue(msg, (gparam_t*)pclient, &sclient)<0) {

1 0

git:master:a156c625: core: pv - use active values for pv buffer slots and size
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: a156c625b434dc0bc19c43ece524f90b1179d881 URL: https://github.com/kamailio/kamailio/commit/a156c625b434dc0bc19c43ece524f90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:21:54+01:00 core: pv - use active values for pv buffer slots and size - during startup, param value and active can be different, up to the moment when the config is completely loaded --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/a156c625b434dc0bc19c43ece524f90… Patch: https://github.com/kamailio/kamailio/commit/a156c625b434dc0bc19c43ece524f90… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 0e4d4d326f..64b9fd96ff 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2105,7 +2105,8 @@ char* pv_get_buffer(void) char *p; p = _pv_print_buffer[_pv_print_buffer_index]; - _pv_print_buffer_index = (_pv_print_buffer_index+1)%_pv_print_buffer_slots; + _pv_print_buffer_index = (_pv_print_buffer_index+1) + % _pv_print_buffer_slots_active; return p; } @@ -2115,7 +2116,7 @@ char* pv_get_buffer(void) */ int pv_get_buffer_size(void) { - return _pv_print_buffer_size; + return _pv_print_buffer_size_active; } /** @@ -2123,7 +2124,7 @@ int pv_get_buffer_size(void) */ int pv_get_buffer_slots(void) { - return _pv_print_buffer_slots; + return _pv_print_buffer_slots_active; } /**

1 0

git:master:ef739858: core: fix setting pv_cache_limit param
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: ef7398589aaff02d6521171ff569726db6996c6a URL: https://github.com/kamailio/kamailio/commit/ef7398589aaff02d6521171ff569726… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T09:03:28+01:00 core: fix setting pv_cache_limit param --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/ef7398589aaff02d6521171ff569726… Patch: https://github.com/kamailio/kamailio/commit/ef7398589aaff02d6521171ff569726… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 4548d321f9..85105120b7 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1556,11 +1556,11 @@ assign_stm: | MAX_WLOOPS EQUAL error { yyerror("number expected"); } | PVBUFSIZE EQUAL NUMBER { pv_set_buffer_size($3); } | PVBUFSIZE EQUAL error { yyerror("number expected"); } - | PVBUFSLOTS EQUAL NUMBER { default_core_cfg.pv_cache_limit=$3; } + | PVBUFSLOTS EQUAL NUMBER { pv_set_buffer_slots($3); } | PVBUFSLOTS EQUAL error { yyerror("number expected"); } - | PVCACHELIMIT EQUAL NUMBER { default_core_cfg.pv_cache_action=$3; } + | PVCACHELIMIT EQUAL NUMBER { default_core_cfg.pv_cache_limit=$3; } | PVCACHELIMIT EQUAL error { yyerror("number expected"); } - | PVCACHEACTION EQUAL NUMBER { pv_set_buffer_slots($3); } + | PVCACHEACTION EQUAL NUMBER { default_core_cfg.pv_cache_action=$3; } | PVCACHEACTION EQUAL error { yyerror("number expected"); } | HTTP_REPLY_PARSE EQUAL NUMBER { http_reply_parse=$3; } | HTTP_REPLY_PARSE EQUAL error { yyerror("boolean value expected"); }

1 0

git:5.0:93434c4b: siptrace: wrapper for sip_trace() variants to pass properly the params
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.0 Commit: 93434c4b90d4df2b24c74e4b0e10c7f7ba305dcc URL: https://github.com/kamailio/kamailio/commit/93434c4b90d4df2b24c74e4b0e10c7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T08:46:59+01:00 siptrace: wrapper for sip_trace() variants to pass properly the params - reported by GH #1351 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/93434c4b90d4df2b24c74e4b0e10c7f… Patch: https://github.com/kamailio/kamailio/commit/93434c4b90d4df2b24c74e4b0e10c7f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index e40835652d..850cd36ae9 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -92,6 +92,8 @@ static int siptrace_init_rpc(void); static int child_init(int rank); static void destroy(void); static int sip_trace(struct sip_msg*, struct dest_info*, str *correlation_id_str, char*); +static int sip_trace0(struct sip_msg *, char *p1, char *p2); +static int sip_trace1(struct sip_msg *, char *dest, char *p2); static int sip_trace2(struct sip_msg *, char *dest, char *correlation_id); static int fixup_siptrace(void ** param, int param_no); @@ -181,8 +183,8 @@ db_func_t db_funcs; /*!< Database functions */ * Exported functions */ static cmd_export_t cmds[] = { - {"sip_trace", (cmd_function)sip_trace, 0, 0, 0, ANY_ROUTE}, - {"sip_trace", (cmd_function)sip_trace, 1, fixup_siptrace, 0, ANY_ROUTE}, + {"sip_trace", (cmd_function)sip_trace0, 0, 0, 0, ANY_ROUTE}, + {"sip_trace", (cmd_function)sip_trace1, 1, fixup_siptrace, 0, ANY_ROUTE}, {"sip_trace", (cmd_function)sip_trace2, 2, fixup_spve_spve, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -970,6 +972,17 @@ static int fixup_siptrace(void** param, int param_no) { return 0; } +static int sip_trace0(struct sip_msg *msg, char *p1, char *p2) +{ + return sip_trace(msg, NULL, NULL, NULL); + +} + +static int sip_trace1(struct sip_msg *msg, char *dest, char *p2) +{ + return sip_trace(msg, (struct dest_info *)dest, NULL, NULL); +} + static int sip_trace2(struct sip_msg *msg, char *dest, char *correlation_id) { struct dest_info *dst = NULL;

1 0

[kamailio/kamailio] loose route cannot be completed when kamailio inserts two Record-Route headers (#1215)
by sergey-safarov 04 Dec '17

04 Dec '17

### Description When kamailio need to pass call from carrier to customer VoIP PBX in docker container on swarm cluster then it not possible. Network interconnection. In docker environment eth1 NIC of kamailio and VoIP PBX connected to internet via iptables masquerading. eth1 NIC of kamailio and VoIP PBX have random IP address and generally no way to pass message between kamailio and VoIP PBX via eth1 NIC. Also both containers have eth0 NIC in same network with static IP. But network on eth0 NIC not connected to Internet. SIP signaling is passed like eth1-Kamailio-eth0 <-> eth0-VoIP PBX In this network kamailio add/removes two Record-Route. For ACK message with two `Route` headers this rule does not work. Each `Route` headers for same kamailio instance and must be translated by one loose_route call ``` The proxy will inspect the URI in the topmost Route header field value. If it indicates this proxy, the proxy removes it from the Route header field (this route node has been reached). ``` Really `Route` headers translated separately and second `loose_route` cannot be completed. Details in `details.txt` [details.txt](https://github.com/kamailio/kamailio/files/1220872/details.txt) Wireshark pcap file and kamailio log with enabled debug attached of similar calls is attached. [full-call.zip](https://github.com/kamailio/kamailio/files/1220875/full-call… #### Reproduction Create config when kamailio add two `Record-Route` headers and send ACK with two `Route` headers -- 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/1215

2 11

git:5.1:a874ac69: core: more checks when printing udp recv debug message
by Daniel-Constantin Mierla 01 Dec '17

01 Dec '17

Module: kamailio Branch: 5.1 Commit: a874ac693bdeaaf913f3a260f0ed0294ea3668f2 URL: https://github.com/kamailio/kamailio/commit/a874ac693bdeaaf913f3a260f0ed029… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-01T14:25:40+01:00 core: more checks when printing udp recv debug message (cherry picked from commit 0e0cd2be0c77f84575526a39c6e3baa199e18d02) --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a874ac693bdeaaf913f3a260f0ed029… Patch: https://github.com/kamailio/kamailio/commit/a874ac693bdeaaf913f3a260f0ed029… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 0392136385..b88d3d8f51 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -425,7 +425,9 @@ int udp_rcv_loop() unsigned int fromlen; struct receive_info ri; sr_event_param_t evp = {0}; - char printbuf[512]; +#define UDP_RCV_PRINTBUF_SIZE 512 +#define UDP_RCV_PRINT_LEN 100 + char printbuf[UDP_RCV_PRINTBUF_SIZE]; int i; int j; int l; @@ -472,20 +474,22 @@ int udp_rcv_loop() if(is_printable(L_DBG) && len>10) { j = 0; - for(i=0; i<len && i<100; i++) { + for(i=0; i<len && i<UDP_RCV_PRINT_LEN + && j+8<UDP_RCV_PRINTBUF_SIZE; i++) { if(isprint(buf[i])) { printbuf[j++] = buf[i]; } else { l = snprintf(printbuf+j, 6, " %02X ", buf[i]); if(l<0 || l>=6) { - LM_ERR("print buffer building failed\n"); + LM_ERR("print buffer building failed (%d/%d/%d)\n", + l, j, i); goto error; } j += l; } } - LM_DBG("received on udp socket: (%d/%d) [[%.*s]]\n", - j, len, len, printbuf); + LM_DBG("received on udp socket: (%d/%d/%d) [[%.*s]]\n", + j, i, len, j, printbuf); } ri.src_su=*from; su2ip_addr(&ri.src_ip, from);

1 0

git:master:0e0cd2be: core: more checks when printing udp recv debug message
by Daniel-Constantin Mierla 01 Dec '17

01 Dec '17

Module: kamailio Branch: master Commit: 0e0cd2be0c77f84575526a39c6e3baa199e18d02 URL: https://github.com/kamailio/kamailio/commit/0e0cd2be0c77f84575526a39c6e3baa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-01T13:43:42+01:00 core: more checks when printing udp recv debug message --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/0e0cd2be0c77f84575526a39c6e3baa… Patch: https://github.com/kamailio/kamailio/commit/0e0cd2be0c77f84575526a39c6e3baa… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 0392136385..b88d3d8f51 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -425,7 +425,9 @@ int udp_rcv_loop() unsigned int fromlen; struct receive_info ri; sr_event_param_t evp = {0}; - char printbuf[512]; +#define UDP_RCV_PRINTBUF_SIZE 512 +#define UDP_RCV_PRINT_LEN 100 + char printbuf[UDP_RCV_PRINTBUF_SIZE]; int i; int j; int l; @@ -472,20 +474,22 @@ int udp_rcv_loop() if(is_printable(L_DBG) && len>10) { j = 0; - for(i=0; i<len && i<100; i++) { + for(i=0; i<len && i<UDP_RCV_PRINT_LEN + && j+8<UDP_RCV_PRINTBUF_SIZE; i++) { if(isprint(buf[i])) { printbuf[j++] = buf[i]; } else { l = snprintf(printbuf+j, 6, " %02X ", buf[i]); if(l<0 || l>=6) { - LM_ERR("print buffer building failed\n"); + LM_ERR("print buffer building failed (%d/%d/%d)\n", + l, j, i); goto error; } j += l; } } - LM_DBG("received on udp socket: (%d/%d) [[%.*s]]\n", - j, len, len, printbuf); + LM_DBG("received on udp socket: (%d/%d/%d) [[%.*s]]\n", + j, i, len, j, printbuf); } ri.src_su=*from; su2ip_addr(&ri.src_ip, from);

1 0

git:master:f5ea35bc: test/unit: 3.sh - updates for using db root password with kamdbctl
by Daniel-Constantin Mierla 01 Dec '17

01 Dec '17

Module: kamailio Branch: master Commit: f5ea35bc424f34c64ee71a745db93326f597c4a1 URL: https://github.com/kamailio/kamailio/commit/f5ea35bc424f34c64ee71a745db9332… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-01T11:07:07+01:00 test/unit: 3.sh - updates for using db root password with kamdbctl --- Modified: test/unit/3.sh --- Diff: https://github.com/kamailio/kamailio/commit/f5ea35bc424f34c64ee71a745db9332… Patch: https://github.com/kamailio/kamailio/commit/f5ea35bc424f34c64ee71a745db9332… --- diff --git a/test/unit/3.sh b/test/unit/3.sh index 03c98b04fb..4b039ba9b0 100755 --- a/test/unit/3.sh +++ b/test/unit/3.sh @@ -20,10 +20,10 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Needs a mysql database, the root user password must be assigned to -# the 'PW' variable in the file 'dbrootpw' in the test directory, e.g.: -# PW=sql_root_passwd +# the 'DBROOTPW' variable in the file 'dbrootpw' in the test directory, e.g.: +# DBROOTPW=sql_root_passwd # If MySQL root password is empty, add in the file the line: -# PWSKIP=yes +# DBROOTPWSKIP=yes . include/common @@ -50,13 +50,13 @@ sed -i '' -e "s/TEST=\"false\"/TEST=\"true\"/g" $DBCTL # set the mysql root password cp $DBCTL.mysql $DBCTL.mysql.bak -sed -i '' -e "s/#PW=\"\"/PW=\"$PW\"/g" $DBCTL.mysql +sed -i '' -e "s/#DBROOTPW=\"\"/DBROOTPW=\"$DBROOTPW\"/g" $DBCTL.mysql -PWSKIP="$PWSKIP" CHARSET="latin1" ./$DBCTL create $tmp_name > /dev/null +DBROOTPWSKIP="$DBROOTPWSKIP" CHARSET="latin1" ./$DBCTL create $tmp_name > /dev/null ret=$? if [ "$ret" -eq 0 ] ; then - PWSKIP="$PWSKIP" ./$DBCTL drop $tmp_name > /dev/null + DBROOTPWSKIP="$DBROOTPWSKIP" ./$DBCTL drop $tmp_name > /dev/null ret=$? fi ;

1 0

git:master:31380513: kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc
by Daniel-Constantin Mierla 01 Dec '17

01 Dec '17

Module: kamailio Branch: master Commit: 313805136d22ed79d1c4900753247032240d5a5b URL: https://github.com/kamailio/kamailio/commit/313805136d22ed79d1c490075324703… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-01T11:05:21+01:00 kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc - DBROOTPW can be now set in kamctlrc - targeting use for automatic testing --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/313805136d22ed79d1c490075324703… Patch: https://github.com/kamailio/kamailio/commit/313805136d22ed79d1c490075324703… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 6ac3cd4c2e..46fcdf5664 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -47,6 +47,11 @@ ## database super user (for ORACLE this is 'scheme-creator' user) # DBROOTUSER="root" +## password for database super user +## - important: this is insecure, targeting the use only for automatic testing +## - known to work for: mysql +# DBROOTPW="dbrootpw" + ## database character set (used by MySQL when creating database) #CHARSET="latin1" diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 8d090fc7fe..422eed8beb 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -32,10 +32,10 @@ if [ -z "$DBROOTUSER" ]; then DBROOTUSER="root" fi -# Uncomment this to set the database root password if you want to run this -# script without any user prompt. This is unsafe, but useful e.g. for -# automatic testing. -#PW="" +# Set DBROOTPW in kamctlrc or via next line to set the database +# root password if you want to run this script without any user prompt. +# This is unsafe, but useful e.g. for automatic testing. +#DBROOTPW="" if [ -z "$DBPORT" ] ; then @@ -55,13 +55,13 @@ prompt_pw() savetty=`stty -g` echo -n "MySQL password for $DBROOTUSER: " stty -echo - read PW + read DBROOTPW stty $savetty echo - export PW + export DBROOTPW } -# execute sql command with optional db name +# execute sql command with optional db name # and password parameters given sql_query() { @@ -72,14 +72,14 @@ sql_query() DB="" fi shift - if [ -n "$PW" ]; then - $CMD "-p$PW" $DB -e "$@" + if [ -n "$DBROOTPW" ]; then + $CMD "-p$DBROOTPW" $DB -e "$@" else $CMD $DB -e "$@" fi else - if [ -n "$PW" ]; then - $CMD "-p$PW" "$@" + if [ -n "$DBROOTPW" ]; then + $CMD "-p$DBROOTPW" "$@" else $CMD "$@" fi @@ -106,9 +106,9 @@ kamailio_drop() # pars: <database name> db_charset_test() { - if [ -n "$PW" ]; then - CURRCHARSET=`echo "show variables like '%character_set_server%'" | $CMD "-p$PW" | $AWK '{print $2}' | $SED -e 1d` - ALLCHARSETS=`echo "show character set" | $CMD "-p$PW" | $AWK '{print $1}' | $SED -e 1d | $GREP -iv -e "utf8\|ucs2"` + if [ -n "$DBROOTPW" ]; then + CURRCHARSET=`echo "show variables like '%character_set_server%'" | $CMD "-p$DBROOTPW" | $AWK '{print $2}' | $SED -e 1d` + ALLCHARSETS=`echo "show character set" | $CMD "-p$DBROOTPW" | $AWK '{print $1}' | $SED -e 1d | $GREP -iv -e "utf8\|ucs2"` else CURRCHARSET=`echo "show variables like '%character_set_server%'" | $CMD | $AWK '{print $2}' | $SED -e 1d` ALLCHARSETS=`echo "show character set" | $CMD | $AWK '{print $1}' | $SED -e 1d | $GREP -iv -e "utf8\|ucs2"` @@ -386,7 +386,7 @@ migrate_table () # 4 paremeters (dst_table, dst_cols, src_table, src_cols) if [ $? -ne 0 ] ; then echo $X | $GREP "ERROR 1146" > /dev/null - if [ $? -eq 0 ] ; then + if [ $? -eq 0 ] ; then echo " -- Migrating $3 to $1.....SKIPPED (no source)" return 0 fi @@ -540,9 +540,9 @@ fi } #end migrate_db() -export PW -if [ "$#" -ne 0 ] && [ "$PW" = "" ]; then - if [ "$PWSKIP" = "" ]; then +export DBROOTPW +if [ "$#" -ne 0 ] && [ "$DBROOTPW" = "" ]; then + if [ "$DBROOTPWSKIP" = "" ]; then prompt_pw fi fi

1 0

git:master:ebe117ca: test/unit: 24.sh - removed invalid comment about mysql
by Daniel-Constantin Mierla 01 Dec '17

01 Dec '17

Module: kamailio Branch: master Commit: ebe117cae681c373a3e9f32e3fb392e31605039f URL: https://github.com/kamailio/kamailio/commit/ebe117cae681c373a3e9f32e3fb392e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-01T10:47:41+01:00 test/unit: 24.sh - removed invalid comment about mysql --- Modified: test/unit/24.sh --- Diff: https://github.com/kamailio/kamailio/commit/ebe117cae681c373a3e9f32e3fb392e… Patch: https://github.com/kamailio/kamailio/commit/ebe117cae681c373a3e9f32e3fb392e… --- diff --git a/test/unit/24.sh b/test/unit/24.sh index 196bb9df2a..cc85017493 100755 --- a/test/unit/24.sh +++ b/test/unit/24.sh @@ -19,9 +19,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Needs a mysql database, the root user password must be given -# in the file 'dbrootpw' in the test directory - . include/common if [ ! -f ~/.pgpass ] ; then

1 0

[kamailio/kamailio] mtree: fix handling of character values >= 0x80 (#1343)
by Timo Teräs 29 Nov '17

29 Nov '17

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This fixes mtree to be able to contain strings with character values larger than 0x80. Previously this would not work because the str.s[i] is 'char' and when cast to 'unsigned int' it would be first sign extended for maximum range (on systems where 'char' defaults to signed). E.g. on x86_64 system: (unsigned int)(char)0x80 = 4294967168 The >=MT_CHAR_TABLE_SIZE test would filter any string containing these characters out as invalid. Code is fixed to cast _mt_char_table index to 'unsigned char' always so index is within range always. The new redundant checks against MT_CHAR_TABLE_SIZE are removed, and the result is stored to local variable (and used from it) to improve code readability. The error message in mt_add_to_tree() is harmonized with the other messages to show the full string with a problem. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1343 -- Commit Summary -- * mtree: fix handling of character values >= 0x80 -- File Changes -- M src/modules/mtree/mtree.c (132) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1343.patch https://github.com/kamailio/kamailio/pull/1343.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/1343

2 5

git:master:ae18e409: mtree: use cast to unsigned char for accessing _mt_char_table array
by Daniel-Constantin Mierla 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: ae18e409d71d2d4eccb4604bb6f29a121309b54e URL: https://github.com/kamailio/kamailio/commit/ae18e409d71d2d4eccb4604bb6f29a1… Author: Timo Teras <timo.teras(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-29T19:58:45+01:00 mtree: use cast to unsigned char for accessing _mt_char_table array - switched the index from unsigned int to unsigned char - simplifies the code by avoiding the tests for exceeding the size of the array - error message extended to print the full string - slightly modified version of PR #1343 --- Modified: src/modules/mtree/mtree.c --- Diff: https://github.com/kamailio/kamailio/commit/ae18e409d71d2d4eccb4604bb6f29a1… Patch: https://github.com/kamailio/kamailio/commit/ae18e409d71d2d4eccb4604bb6f29a1…

1 0

git:5.0:5f26a4e8: evapi: enable tcp keepalive on client connections
by Victor Seva 29 Nov '17

29 Nov '17

Module: kamailio Branch: 5.0 Commit: 5f26a4e8c55cdf5a5a7eaf6864c4f5213d321293 URL: https://github.com/kamailio/kamailio/commit/5f26a4e8c55cdf5a5a7eaf6864c4f52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-29T13:53:10+01:00 evapi: enable tcp keepalive on client connections (cherry picked from commit d340582267174ccb0a5d816049c582fe75d2177b) --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/5f26a4e8c55cdf5a5a7eaf6864c4f52… Patch: https://github.com/kamailio/kamailio/commit/5f26a4e8c55cdf5a5a7eaf6864c4f52… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 3aa5288c7f..9fcde59f39 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -450,6 +450,8 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent struct ev_io *evapi_client; int i; evapi_env_t evenv; + int optval; + socklen_t optlen; evapi_client = (struct ev_io*) malloc (sizeof(struct ev_io)); if(evapi_client==NULL) { @@ -496,6 +498,12 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent return; } } + optval = 1; + optlen = sizeof(optval); + if(setsockopt(csock, SOL_SOCKET, SO_KEEPALIVE, + &optval, optlen) < 0) { + LM_WARN("failed to enable keepalive on socket %d\n", csock); + } _evapi_clients[i].connected = 1; _evapi_clients[i].sock = csock; _evapi_clients[i].af = caddr.sa_family;

1 0

git:5.0:c7dc3f9d: evapi: do close() on client socket if libev detects it is gone
by Victor Seva 29 Nov '17

29 Nov '17

Module: kamailio Branch: 5.0 Commit: c7dc3f9dbd691323bb65c549c6578adfb03392c6 URL: https://github.com/kamailio/kamailio/commit/c7dc3f9dbd691323bb65c549c6578ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-29T13:53:10+01:00 evapi: do close() on client socket if libev detects it is gone - handle socket values for valid range >=0 (cherry picked from commit bb91d6c4fa88324c31d3b7a91687057e0ae8bfa0) --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c7dc3f9dbd691323bb65c549c6578ad… Patch: https://github.com/kamailio/kamailio/commit/c7dc3f9dbd691323bb65c549c6578ad… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 47fc6a0052..3aa5288c7f 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -154,10 +154,10 @@ int evapi_close_connection(int cidx) if(cidx<0 || cidx>=EVAPI_MAX_CLIENTS) return -1; if(_evapi_clients[cidx].connected==1 - && _evapi_clients[cidx].sock > 0) { + && _evapi_clients[cidx].sock >= 0) { close(_evapi_clients[cidx].sock); _evapi_clients[cidx].connected = 0; - _evapi_clients[cidx].sock = 0; + _evapi_clients[cidx].sock = -1; return 0; } return -2; @@ -196,7 +196,7 @@ int evapi_set_tag(sip_msg_t* msg, str* stag) return -1; if(!(_evapi_clients[evenv->conidx].connected==1 - && _evapi_clients[evenv->conidx].sock > 0)) { + && _evapi_clients[evenv->conidx].sock >= 0)) { LM_ERR("connection not established\n"); return -1; } @@ -221,7 +221,8 @@ int evapi_init_notify_sockets(void) LM_ERR("opening notify stream socket pair\n"); return -1; } - LM_DBG("inter-process event notification sockets initialized\n"); + LM_DBG("inter-process event notification sockets initialized: %d ~ %d\n", + _evapi_notify_sockets[0], _evapi_notify_sockets[1]); return 0; } @@ -256,7 +257,7 @@ int evapi_dispatch_notify(evapi_msg_t *emsg) n = 0; for(i=0; i<EVAPI_MAX_CLIENTS; i++) { - if(_evapi_clients[i].connected==1 && _evapi_clients[i].sock>0) { + if(_evapi_clients[i].connected==1 && _evapi_clients[i].sock>=0) { if(emsg->tag.s==NULL || (emsg->tag.len = _evapi_clients[i].stag.len && strncmp(_evapi_clients[i].stag.s, emsg->tag.s, emsg->tag.len)==0)) { @@ -329,7 +330,10 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) evenv.conidx = i; evapi_run_cfg_route(&evenv, _evapi_rts.con_closed); _evapi_clients[i].connected = 0; - _evapi_clients[i].sock = 0; + if(_evapi_clients[i].sock>=0) { + close(_evapi_clients[i].sock); + } + _evapi_clients[i].sock = -1; _evapi_clients[i].rpos = 0; ev_io_stop(loop, watcher); free(watcher); @@ -565,11 +569,14 @@ int evapi_run_dispatcher(char *laddr, int lport) struct ev_io io_notify; int yes_true = 1; int fflags = 0; + int i; LM_DBG("starting dispatcher processing\n"); memset(_evapi_clients, 0, sizeof(evapi_client_t) * EVAPI_MAX_CLIENTS); - + for(i=0; i<EVAPI_MAX_CLIENTS; i++) { + _evapi_clients[i].sock = -1; + } loop = ev_default_loop(0); if(loop==NULL) { @@ -843,7 +850,7 @@ int pv_get_evapi(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); if(_evapi_clients[evenv->conidx].connected==0 - && _evapi_clients[evenv->conidx].sock <= 0) + && _evapi_clients[evenv->conidx].sock < 0) return pv_get_null(msg, param, res); switch(param->pvn.u.isname.name.n)

1 0

git:5.0:b543496e: evapi: dispatcher worker to send event data directly
by Victor Seva 29 Nov '17

29 Nov '17

Module: kamailio Branch: 5.0 Commit: b543496e9e33639684e88fc28fda7cca61ada239 URL: https://github.com/kamailio/kamailio/commit/b543496e9e33639684e88fc28fda7cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-29T13:53:01+01:00 evapi: dispatcher worker to send event data directly - instead of trying to send over internal socket, which is open only for reading in this process (cherry picked from commit 95bd694e75c250d8b26cac071bff2e48e0eb9062) --- Modified: src/modules/evapi/evapi_dispatch.c Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b543496e9e33639684e88fc28fda7cc… Patch: https://github.com/kamailio/kamailio/commit/b543496e9e33639684e88fc28fda7cc… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index f4d6ae3375..47fc6a0052 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -44,6 +44,8 @@ static int _evapi_notify_sockets[2]; static int _evapi_netstring_format = 1; +extern int _evapi_dispatcher_pid; + #define EVAPI_IPADDR_SIZE 64 #define EVAPI_TAG_SIZE 64 #define CLIENT_BUFFER_SIZE 32768 @@ -230,6 +232,7 @@ void evapi_close_notify_sockets_child(void) { LM_DBG("closing the notification socket used by children\n"); close(_evapi_notify_sockets[1]); + _evapi_notify_sockets[1] = -1; } /** @@ -239,6 +242,7 @@ void evapi_close_notify_sockets_parent(void) { LM_DBG("closing the notification socket used by parent\n"); close(_evapi_notify_sockets[0]); + _evapi_notify_sockets[0] = -1; } /** @@ -701,11 +705,21 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) emsg->unicast = unicast; } - LM_DBG("sending [%p] [%.*s] (%d)\n", emsg, emsg->data.len, emsg->data.s, emsg->data.len); - len = write(_evapi_notify_sockets[1], &emsg, sizeof(evapi_msg_t*)); - if(len<=0) { - LM_ERR("failed to pass the pointer to evapi dispatcher\n"); - return -1; + LM_DBG("sending [%p] [%.*s] (%d)\n", emsg, emsg->data.len, emsg->data.s, + emsg->data.len); + if(_evapi_notify_sockets[1]!=-1) { + len = write(_evapi_notify_sockets[1], &emsg, sizeof(evapi_msg_t*)); + if(len<=0) { + shm_free(emsg); + LM_ERR("failed to pass the pointer to evapi dispatcher\n"); + return -1; + } + } else { + cfg_update(); + LM_DBG("dispatching [%p] [%.*s] (%d)\n", emsg, + emsg->data.len, emsg->data.s, emsg->data.len); + evapi_dispatch_notify(emsg); + shm_free(emsg); } return 0; } diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index e9a8163948..e9f2da98af 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -50,8 +50,9 @@ static int _evapi_bind_port = 8448; static char *_evapi_bind_param = NULL; static int _evapi_netstring_format_param = 1; +int _evapi_dispatcher_pid = -1; + static tm_api_t tmb; -static int _evapi_dispatcher_pid = -1; static int mod_init(void); static int child_init(int);

1 0

[kamailio/kamailio] evapi: add module parameter to enable keepalive (#1290)
by Victor Seva 29 Nov '17

29 Nov '17

I'm having issues when I reach EVAPI_MAX_CLIENTS connections but some of them are just lingering and they are never release, so no new connections can be handled. Maybe keepalive will help detecting those lingering connections and release them -- 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/1290

2 4

git:5.1:f3340967: nat_traversal: handle local generated transactions (#1344)
by Luis Azedo 29 Nov '17

29 Nov '17

Module: kamailio Branch: 5.1 Commit: f3340967e2979f4ec7de2cc1c828f35028a65306 URL: https://github.com/kamailio/kamailio/commit/f3340967e2979f4ec7de2cc1c828f35… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-11-29T11:11:46Z nat_traversal: handle local generated transactions (#1344) * nat_traversal: fix local generated transactions * nat_traversal: handle TMCB_RESPONSE_SENT only for FAKED_REPLY * nat_traversal: free allocated buffer (cherry picked from commit 886f14e11e3e5fe9d2bc56fd37d2102ae5b99645) --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/f3340967e2979f4ec7de2cc1c828f35… Patch: https://github.com/kamailio/kamailio/commit/f3340967e2979f4ec7de2cc1c828f35… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index ae38d7653b..3ddee233d6 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1358,17 +1358,42 @@ __sl_reply_out(sl_cbp_t *slcbp) static void __tm_reply_in(struct cell *trans, int type, struct tmcb_params *param) { - time_t expire; + time_t expire = 0; if (param->req==NULL || param->rpl==NULL) return; + if(type == TMCB_RESPONSE_SENT && param->rpl!=FAKED_REPLY) + return; + if (param->code >= 200 && param->code < 300) { switch (param->req->REQ_METHOD) { case METHOD_SUBSCRIBE: - expire = get_expires(param->rpl); - if (expire > 0) + if(type == TMCB_RESPONSE_SENT) { + char* tmp = pkg_malloc(param->send_buf.len+1); + if(tmp) { + sip_msg_t msg; + strncpy(tmp, param->send_buf.s, param->send_buf.len); + tmp[param->send_buf.len] = '\0'; + memset(&msg, 0, sizeof(sip_msg_t)); + msg.buf=tmp; + msg.len=param->send_buf.len; + if(parse_msg(tmp, param->send_buf.len, &msg) != 0) { + LM_ERR("ERROR PARSING REPLY\n"); + } else { + expire = get_expires(&msg); + } + free_sip_msg(&msg); + pkg_free(tmp); + } + } else { + expire = get_expires(param->rpl); + } + if (expire > 0) { keepalive_subscription(param->req, expire); + } else { + LM_DBG("expires == 0\n"); + } break; case METHOD_REGISTER: expire = get_register_expire(param->req, param->rpl); @@ -1404,7 +1429,7 @@ NAT_Keepalive(struct sip_msg *msg) // fallthrough case METHOD_SUBSCRIBE: msg->msg_flags |= FL_DO_KEEPALIVE; - if (tm_api.register_tmcb(msg, 0, TMCB_RESPONSE_IN, __tm_reply_in, 0, 0) <= 0) { + if (tm_api.register_tmcb(msg, 0, TMCB_RESPONSE_IN | TMCB_RESPONSE_SENT, __tm_reply_in, 0, 0) <= 0) { LM_ERR("cannot register TM callback for incoming replies\n"); return -1; }

1 0

git:5.1:36ec5c4d: presence: update contact in update_subs_db
by Luis Azedo 29 Nov '17

29 Nov '17

Module: kamailio Branch: 5.1 Commit: 36ec5c4dd9f66a93bc18c7a1ee428bd6f1e0064c URL: https://github.com/kamailio/kamailio/commit/36ec5c4dd9f66a93bc18c7a1ee428bd… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-11-29T11:11:35Z presence: update contact in update_subs_db (cherry picked from commit 49272f23b22445415721766709bf5841865e8609) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/36ec5c4dd9f66a93bc18c7a1ee428bd… Patch: https://github.com/kamailio/kamailio/commit/36ec5c4dd9f66a93bc18c7a1ee428bd… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index ee90bf7c85..f199f95c58 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -420,6 +420,13 @@ int update_subs_db(subs_t* subs, int type) update_vals[n_update_cols].nul = 0; update_vals[n_update_cols].val.int_val = subs->updated_winfo; n_update_cols++; + + update_keys[n_update_cols] = &str_contact_col; + update_vals[n_update_cols].type = DB1_STR; + update_vals[n_update_cols].nul = 0; + update_vals[n_update_cols].val.str_val = subs->contact; + n_update_cols++; + } if(type & LOCAL_TYPE) {

1 0

git:5.0:ffdc513e: nat_traversal: handle local generated transactions (#1344)
by Luis Azedo 29 Nov '17

29 Nov '17

Module: kamailio Branch: 5.0 Commit: ffdc513e75d0ca294ff697ffc19cf2d45beb68dd URL: https://github.com/kamailio/kamailio/commit/ffdc513e75d0ca294ff697ffc19cf2d… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-11-29T11:11:03Z nat_traversal: handle local generated transactions (#1344) * nat_traversal: fix local generated transactions * nat_traversal: handle TMCB_RESPONSE_SENT only for FAKED_REPLY * nat_traversal: free allocated buffer (cherry picked from commit 886f14e11e3e5fe9d2bc56fd37d2102ae5b99645) --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/ffdc513e75d0ca294ff697ffc19cf2d… Patch: https://github.com/kamailio/kamailio/commit/ffdc513e75d0ca294ff697ffc19cf2d… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index ae38d7653b..3ddee233d6 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1358,17 +1358,42 @@ __sl_reply_out(sl_cbp_t *slcbp) static void __tm_reply_in(struct cell *trans, int type, struct tmcb_params *param) { - time_t expire; + time_t expire = 0; if (param->req==NULL || param->rpl==NULL) return; + if(type == TMCB_RESPONSE_SENT && param->rpl!=FAKED_REPLY) + return; + if (param->code >= 200 && param->code < 300) { switch (param->req->REQ_METHOD) { case METHOD_SUBSCRIBE: - expire = get_expires(param->rpl); - if (expire > 0) + if(type == TMCB_RESPONSE_SENT) { + char* tmp = pkg_malloc(param->send_buf.len+1); + if(tmp) { + sip_msg_t msg; + strncpy(tmp, param->send_buf.s, param->send_buf.len); + tmp[param->send_buf.len] = '\0'; + memset(&msg, 0, sizeof(sip_msg_t)); + msg.buf=tmp; + msg.len=param->send_buf.len; + if(parse_msg(tmp, param->send_buf.len, &msg) != 0) { + LM_ERR("ERROR PARSING REPLY\n"); + } else { + expire = get_expires(&msg); + } + free_sip_msg(&msg); + pkg_free(tmp); + } + } else { + expire = get_expires(param->rpl); + } + if (expire > 0) { keepalive_subscription(param->req, expire); + } else { + LM_DBG("expires == 0\n"); + } break; case METHOD_REGISTER: expire = get_register_expire(param->req, param->rpl); @@ -1404,7 +1429,7 @@ NAT_Keepalive(struct sip_msg *msg) // fallthrough case METHOD_SUBSCRIBE: msg->msg_flags |= FL_DO_KEEPALIVE; - if (tm_api.register_tmcb(msg, 0, TMCB_RESPONSE_IN, __tm_reply_in, 0, 0) <= 0) { + if (tm_api.register_tmcb(msg, 0, TMCB_RESPONSE_IN | TMCB_RESPONSE_SENT, __tm_reply_in, 0, 0) <= 0) { LM_ERR("cannot register TM callback for incoming replies\n"); return -1; }

1 0

git:5.0:85b92f51: presence: update contact in update_subs_db
by Luis Azedo 29 Nov '17

29 Nov '17

Module: kamailio Branch: 5.0 Commit: 85b92f51b173bd76d288feeb69d576964ef1e9d4 URL: https://github.com/kamailio/kamailio/commit/85b92f51b173bd76d288feeb69d5769… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-11-29T11:10:10Z presence: update contact in update_subs_db (cherry picked from commit 49272f23b22445415721766709bf5841865e8609) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/85b92f51b173bd76d288feeb69d5769… Patch: https://github.com/kamailio/kamailio/commit/85b92f51b173bd76d288feeb69d5769… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 000b87d165..2ac98dc252 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -420,6 +420,13 @@ int update_subs_db(subs_t* subs, int type) update_vals[n_update_cols].nul = 0; update_vals[n_update_cols].val.int_val = subs->updated_winfo; n_update_cols++; + + update_keys[n_update_cols] = &str_contact_col; + update_vals[n_update_cols].type = DB1_STR; + update_vals[n_update_cols].nul = 0; + update_vals[n_update_cols].val.str_val = subs->contact; + n_update_cols++; + } if(type & LOCAL_TYPE) {

1 0

[kamailio/kamailio] Kamailio 5.0.3 segfault (in redis module?) (#1342)
by Sebastian Damm 29 Nov '17

29 Nov '17

### Description We have a Kamailio running with a sipcapture module, then handling everything in app_lua and writing some information to a redis server. This Kamailio crashed after running for about a day. ### Troubleshooting #### Debugging Data This is the gdb output of bt full: ``` GNU gdb (Debian 7.7.1+dfsg-5) 7.7.1 Copyright (C) 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/.build-id/98/6903c27311ebc3717be5ca53d70d130c092eea.debug...done. done. [New LWP 120921] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio_li_sniffer.pid -f /etc/kamaili'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007ff05e2d5c3a in strlen () from /lib/x86_64-linux-gnu/libc.so.6 #0 0x00007ff05e2d5c3a in strlen () from /lib/x86_64-linux-gnu/libc.so.6 No symbol table info available. #1 0x00007ff05783f2aa in redisvFormatCommand () from /usr/lib/x86_64-linux-gnu/libhiredis.so.0.10 No symbol table info available. #2 0x00007ff0578400a2 in redisvAppendCommand () from /usr/lib/x86_64-linux-gnu/libhiredis.so.0.10 No symbol table info available. #3 0x00007ff057840289 in redisvCommand () from /usr/lib/x86_64-linux-gnu/libhiredis.so.0.10 No symbol table info available. #4 0x00007ff057a4d6ac in redisc_exec (srv=0x7ffd7df680d0, res=0x7ffd7df680f0, cmd=0x7ffd7df680e0) at redis_client.c:402 rsrv = 0x7ff05d2bdba0 rpl = 0x7ff05d2eb020 c = 0 '\000' ap = {{gp_offset = 40, fp_offset = 48, overflow_arg_area = 0x7ffd7df680a0, reg_save_area = 0x7ffd7df67fb0}} ap2 = {{gp_offset = 24, fp_offset = 48, overflow_arg_area = 0x7ffd7df680a0, reg_save_area = 0x7ffd7df67fb0}} __FUNCTION__ = "redisc_exec" #5 0x00007ff057a51156 in w_redis_cmd3 (msg=0x7ff05d30ca28, ssrv=0x7ff05d2d6088 "p\270-]\360\177", scmd=0x7ff05d2d61b0 "\360\237-]\360\177", sres=0x7ff05d2d62d8 "\030z-]\360\177") at ndb_redis_mod.c:160 s = {{s = 0x7ff05d2db870 "liRedis", len = 7}, { s = 0x7ff05d2a00a0 "SETEX ACTIVECHANNELS_swp3pvm7jqpnu6ixphj1jc7c24(a)sipgate.de 21600 \n%swp3pvm7jqpnu6ixphj1jc7c24(a)sipgate.de\022\n2457742e16\032\n4923256980\"%swp3pvm7jqpnu6ixphj1jc7c24(a)sipgate.de", len = 167}, { s = 0x7ff05d2d7a18 "r", len = 1}} __FUNCTION__ = "w_redis_cmd3" #6 0x000000000045ceac in do_action (h=0x7ffd7df68800, a=0x7ff05d2d6f78, msg=0x7ff05d30ca28) at core/action.c:1072 ret = -5 v = 1583322656 dst = {send_sock = 0x770000006e, to = {s = {sa_family = 38432, sa_data = "_^\360\177\000\000\060\217\000\000\000\000\000"}, sin = {sin_family = 38432, sin_port = 24159, sin_addr = {s_addr = 32752}, sin_zero = "0\217\000\000\000\000\000"}, sin6 = {sin6_family = 38432, sin6_port = 24159, sin6_flowinfo = 32752, sin6_addr = {__in6_u = {__u6_addr8 = "0\217\000\000\000\000\000\000 \226_^\360\177\000", __u6_addr16 = {36656, 0, 0, 0, 38432, 24159, 32752, 0}, __u6_addr32 = {36656, 0, 1583322656, 32752}}}, sin6_scope_id = 3}}, id = 0, proto = -104 '\230', send_flags = {f = 191 '\277', blst_imask = 241 '\361'}} tmp = 0x1ef559c "" new_uri = 0x0 end = 0x0 crt = 0xffffffffffffffff <error: Cannot access memory at address 0xffffffffffffffff> cmd = 0x7ff05d2b9940 len = 131296 user = 0 uri = {user = {s = 0x7ffd7df68530 "\220\207\366}\375\177", len = 0}, passwd = {s = 0x7ffd7df68430 " ", len = 32620272}, host = {s = 0x5 <error: Cannot access memory at address 0x5>, len = 2113307744}, port = { s = 0x7ffd7df684b0 "\330\204\366}\375\177", len = 32620440}, params = {s = 0x7c <error: Cannot access memory at address 0x7c>, len = 0}, sip_params = {s = 0x770000006e <error: Cannot access memory at address 0x770000006e>, len = 31080512}, headers = {s = 0x20 <error: Cannot access memory at address 0x20>, len = 1583322656}, port_no = 16480, proto = 474, type = ERROR_URI_T, flags = (unknown: 32462272), transport = { s = 0x20 <error: Cannot access memory at address 0x20>, len = 1580005056}, ttl = {s = 0x4 <error: Cannot access memory at address 0x4>, len = 240}, user_param = {s = 0x7ff05e5f9620 "", len = 1583322656}, maddr = { s = 0x9 <error: Cannot access memory at address 0x9>, len = 0}, method = {s = 0x7ff057842acf "", len = 0}, lr = {s = 0x0, len = 1580007456}, r2 = {s = 0x7ffd7df684d8 "0\205\366}\375\177", len = -24651520}, gr = {s = 0x0, len = 33205536}, transport_val = {s = 0x7ffd7df68570 "\377\377\377\177", len = 2113307952}, ttl_val = {s = 0x7ffd7df68618 "", len = 1579810305}, user_param_val = {s = 0x32 <error: Cannot access memory at address 0x32>, len = 2113310080}, maddr_val = {s = 0x7ffd7df68790 "", len = 1579814957}, method_val = {s = 0x7ffd7df68628 "", len = 1579810305}, lr_val = {s = 0x7ffd7df68731 "\206\366}\375\177", len = 2113310080}, r2_val = { s = 0x7ffd7df68790 "", len = -24651520}, gr_val = {s = 0x3000000030 <error: Cannot access memory at address 0x3000000030>, len = 32418038}} next_hop = {user = {s = 0x1eea8f6 "", len = 32418028}, passwd = {s = 0x0, len = 10}, host = {s = 0x7fffffff <error: Cannot access memory at address 0x7fffffff>, len = 1375378619}, port = { s = 0x3 <error: Cannot access memory at address 0x3>, len = 48}, params = {s = 0x30 <error: Cannot access memory at address 0x30>, len = 2113309744}, sip_params = {s = 0x1d8ff12 "x", len = 32418038}, headers = { s = 0x7ffd00000000 <error: Cannot access memory at address 0x7ffd00000000>, len = 2113308496}, port_no = 43240, proto = 494, type = ERROR_URI_T, flags = (unknown: 0), transport = {s = 0x7ffd7df68730 " \206\366}\375\177", len = 0}, ttl = {s = 0x7ffd7df68630 "", len = 12}, user_param = {s = 0x7ff000000009 <error: Cannot access memory at address 0x7ff000000009>, len = 2113308256}, maddr = {s = 0x7ffd7df686b0 "", len = 0}, method = { s = 0x7ffd7df68c5c "", len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x3ff0000000000000 <error: Cannot access memory at address 0x3ff0000000000000>, len = 1579812146}, gr = { s = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s", len = 2113308528}, transport_val = {s = 0x0, len = 2}, ttl_val = {s = 0xe00000067 <error: Cannot access memory at address 0xe00000067>, len = 1}, user_param_val = {s = 0x13 <error: Cannot access memory at address 0x13>, len = 2113307984}, maddr_val = {s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 2113310080}, method_val = { s = 0x7ffd7df68520 "1\207\366}\375\177", len = 0}, lr_val = {s = 0x7ff05e3b8fea ".", len = 2113307992}, r2_val = {s = 0x0, len = 2113307958}, gr_val = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 4}} u = 0x1ef5597 port = 24159 dst_host = 0x0 i = 1583322656 flags = 32752 avp = 0xffffffffffffffff st = {flags = 0, id = 0, name = {n = 91, s = {s = 0x5b <error: Cannot access memory at address 0x5b>, len = -1}, re = 0x5b}, avp = 0x0} sct = 0x60 sjt = 0x0 rve = 0x0 mct = 0x0 rv = 0x1ef5597 rv1 = 0x0 c1 = {cache_type = 5, val_type = RV_NONE, c = {avp_val = {n = 2113309744, s = {s = 0x7ffd7df68c30 "", len = 30998297}, re = 0x7ffd7df68c30}, pval = {rs = {s = 0x7ffd7df68c30 "", len = 30998297}, ri = 32418038, flags = 0}}, i2s = "\000\000\000\000\000\000\000\000\000\177\360\001\006\000\000\000\350\250\356\001\000"} s = {s = 0x5 <error: Cannot access memory at address 0x5>, len = 112} srevp = {0xffffffffffffffff, 0x0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #7 0x0000000000469afa in run_actions (h=0x7ffd7df68800, a=0x7ff05d2d6f78, msg=0x7ff05d30ca28) at core/action.c:1552 t = 0x7ff05d2d6f78 ret = -1 mod = 0x7ff057c7d3cd ms = 0 __FUNCTION__ = "run_actions" #8 0x000000000046a1b1 in run_actions_safe (h=0x7ffd7df6aee0, a=0x7ff05d2d6f78, msg=0x7ff05d30ca28) at core/action.c:1620 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {140670332234288, 1667728728683687988, 4291248, 140726716774352, 0, 0, 1667728728687882292, -1666880443433635788}, __mask_was_saved = 0, __saved_mask = { __val = {140724603453440, 0, 140668768878606, 0, 0, 0, 0, 18446744073709551615, 140670348687719, 30759624, 140670348687770, 6, 140670241592264, 47260797760, 140724603453441, 140670241592269}}}}} ret = 32765 ign_on_break = 0 #9 0x000000000042dc6f in rval_get_int (h=0x7ffd7df6aee0, msg=0x7ff05d30ca28, i=0x7ffd7df68b54, rv=0x7ff05d2db0d8, cache=0x0) at core/rvalue.c:912 r_avp = 0x7ffd7df689c0 avp_val = {n = 2113309200, s = {s = 0x7ffd7df68a10 "(\312\060]\360\177", len = 133}, re = 0x7ffd7df68a10} pval = {rs = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 16005432}, ri = 384480, flags = 4} tmp = {s = 0x8 <error: Cannot access memory at address 0x8>, len = 1375346761} s = 0x0 r = 2113309072 ret = 0 destroy_pval = 0 __FUNCTION__ = "rval_get_int" #10 0x0000000000432374 in rval_expr_eval_int (h=0x7ffd7df6aee0, msg=0x7ff05d30ca28, res=0x7ffd7df68b54, rve=0x7ff05d2db0d0) at core/rvalue.c:1906 i1 = 0 i2 = 1 ret = -1 c1 = {cache_type = RV_CACHE_EMPTY, val_type = RV_NONE, c = {avp_val = {n = 1562718224, s = {s = 0x7ff05d253010 "\001", len = 2113309376}, re = 0x7ff05d253010}, pval = {rs = {s = 0x7ff05d253010 "\001", len = 2113309376}, ri = 1533206860, flags = 32752}}, i2s = "n\000\000\000w", '\000' <repeats 14 times>, "\001\000"} c2 = {cache_type = 386872, val_type = RV_NONE, c = {avp_val = {n = 774176, s = {s = 0xbd020 <error: Cannot access memory at address 0xbd020>, len = 777848}, re = 0xbd020}, pval = {rs = { s = 0xbd020 <error: Cannot access memory at address 0xbd020>, len = 777848}, ri = 8, flags = 0}}, i2s = "6\000\000\000\000\000\000\000\000\331\207\376s\325T\271\360\212\366}\375\177"} rv1 = 0x7ffd7df68a80 rv2 = 0x7ff05d253010 __FUNCTION__ = "rval_expr_eval_int" #11 0x00000000004327b9 in rval_expr_eval_int (h=0x7ffd7df6aee0, msg=0x7ff05d30ca28, res=0x7ffd7df68c88, rve=0x7ff05d2da808) at core/rvalue.c:1914 i1 = 0 i2 = 1562718224 ret = -1 c1 = {cache_type = 4291248, val_type = RV_NONE, c = {avp_val = {n = 2113320912, s = {s = 0x7ffd7df6b7d0 "\r", len = 0}, re = 0x7ffd7df6b7d0}, pval = {rs = {s = 0x7ffd7df6b7d0 "\r", len = 0}, ri = 0, flags = 0}}, i2s = "\320\213\366}\375\177\000\000\027\305B\000\000\000\000\000\364\373\350\001\000"} c2 = {cache_type = 2113310080, val_type = 936, c = {avp_val = {n = 1563496992, s = {s = 0x7ff05d311220 "\002", len = 2113309696}, re = 0x7ff05d311220}, pval = {rs = {s = 0x7ff05d311220 "\002", len = 2113309696}, ri = 4376047, flags = 0}}, i2s = "\260zA\000P\000\000\000P\214\366}\375\177\000\000\000\000\000\000\000"} rv1 = 0x1dbe558 rv2 = 0x7ff05d2eea30 __FUNCTION__ = "rval_expr_eval_int" #12 0x000000000045c7c5 in do_action (h=0x7ffd7df6aee0, a=0x7ff05d2dc010, msg=0x7ff05d30ca28) at core/action.c:1030 ret = -5 v = 0 dst = {send_sock = 0x1000000, to = {s = {sa_family = 13192, sa_data = "\364\000\000\000\000\000\220\343\005\000\000\000\000"}, sin = {sin_family = 13192, sin_port = 244, sin_addr = {s_addr = 0}, sin_zero = "\220\343\005\000\000\000\000"}, sin6 = {sin6_family = 13192, sin6_port = 244, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\220\343\005\000\000\000\000\000x\314\v\000\000\000\000", __u6_addr16 = {58256, 5, 0, 0, 52344, 11, 0, 0}, __u6_addr32 = {385936, 0, 773240, 0}}}, sin6_scope_id = 777848}}, id = 0, proto = 8 '\b', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} tmp = 0x7ff057c6acae "H\205\300u\034H\205\333t\027\276\004" new_uri = 0x0 end = 0x0 crt = 0x1e8fbf4 "24" cmd = 0x7ff05d2c7a70 len = 2113310048 user = 32765 uri = {user = {s = 0x7ffd7df68f80 "", len = 6677782}, passwd = {s = 0x0, len = 0}, host = {s = 0x73e120 "core", len = 2113310720}, port = {s = 0x7ff05d2d89a0 "\001", len = 1563478568}, params = { s = 0x5d311220 <error: Cannot access memory at address 0x5d311220>, len = 0}, sip_params = {s = 0x7ff05d2c8780 "\030\210,]\360\177", len = -24651520}, headers = {s = 0x7ffd7df68f90 " \220\366}\375\177", len = 5981733}, port_no = 936, proto = 0, type = ERROR_URI_T, flags = (unknown: 2113310720), transport = {s = 0x7ff05d2d8988 "\017", len = 1563478568}, ttl = {s = 0x7ff05d311228 "n\025\061]\360\177", len = 0}, user_param = { s = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s", len = 1563355696}, maddr = {s = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s", len = 5989420}, method = {s = 0x0, len = 2113310720}, lr = {s = 0x7ffd7df69020 "P\220\366}\375\177", len = 4399688}, r2 = {s = 0x1ecbd70 "\020\321\334\001", len = 0}, gr = {s = 0x7ff05d2d8980 "\a", len = 2113311192}, transport_val = { s = 0x7ff05d30ca28 "\243\221d", len = 2113318624}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x7ffd7df69040 "(\312\060]\360\177", len = 4398966}, maddr_val = {s = 0x7ffd7df690d0 "", len = 1563259632}, method_val = { s = 0x0, len = 0}, lr_val = {s = 0x0, len = -24651520}, r2_val = {s = 0x7ffd7df69050 "\200\221\366}\375\177", len = 4399820}, gr_val = {s = 0x7ff05d2d8978 "\001", len = 2113311192}} next_hop = {user = {s = 0x7ff05d30ca28 "\243\221d", len = 2113318624}, passwd = {s = 0x7ffd7df69180 "\260\222\366}\375\177", len = 4405224}, host = {s = 0x0, len = 30759440}, port = {s = 0x7ffd7df69090 "(\312\060]\360\177", len = 1472711292}, params = {s = 0x7ff05d2d97d8 "!", len = 2113311192}, sip_params = {s = 0x7ff05d30ca28 "\243\221d", len = 2113318624}, headers = {s = 0x1d55a10 "\200\065\357\001", len = -24651520}, port_no = 37104, proto = 32246, type = 32765, flags = (unknown: 30759440), transport = {s = 0x7ff05d2d72f0 "\a", len = 1563261728}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x1df8de0 " \273\354\001", len = 1472632365}, method = {s = 0x1d55a10 "\200\065\357\001", len = 30759440}, lr = {s = 0x1df8de0 " \273\354\001", len = 1472620846}, r2 = {s = 0x8 <error: Cannot access memory at address 0x8>, len = 30759440}, gr = { s = 0x7ff057c62030 "\213V\bH\213\066\351\225U", len = 2113311360}, transport_val = {s = 0x0, len = -24651520}, ttl_val = {s = 0xe8de0e2342a7b034 <error: Cannot access memory at address 0xe8de0e2342a7b034>, len = 1563355696}, user_param_val = {s = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s", len = 2113320912}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x7ffd7df692b0 "\200\230\366}\375\177", len = 4401525}, lr_val = {s = 0x1f07f00 "\020]\337\001", len = 4291248}, r2_val = {s = 0x7ffd7df6b7d0 "\r", len = 1563355696}, gr_val = {s = 0x7ff05d2d90a8 "\017", len = 2113311496}} u = 0x2 port = 0 dst_host = 0x7ff05d30ca28 i = 1472702157 flags = 0 avp = 0x7ffd7df68e30 st = {flags = 2113310352, id = 32765, name = {n = 1533206860, s = {s = 0x7ff05b62e14c <pkg_proc_update_stats+130> "H\213\r\225M ", len = 2113310544}, re = 0x7ff05b62e14c <pkg_proc_update_stats+130>}, avp = 0x0} sct = 0xb954d573fe87d900 sjt = 0x7ffd7df68e70 rve = 0x7ff05d2da808 mct = 0x664969 <qm_info+46> rv = 0x1f0ec00 rv1 = 0x7ffd7df690d8 c1 = {cache_type = 55, val_type = RV_NONE, c = {avp_val = {n = -24651520, s = {s = 0xb954d573fe87d900 <error: Cannot access memory at address 0xb954d573fe87d900>, len = 2113310400}, re = 0xb954d573fe87d900}, pval = {rs = { s = 0xb954d573fe87d900 <error: Cannot access memory at address 0xb954d573fe87d900>, len = 2113310400}, ri = 4842663, flags = 0}}, i2s = "\000\000\000\000\000\000\000\000@z{\000\005\000\000\000\200c%]\360\177"} s = {s = 0x7ffd7df68e50 "", len = 1562718224} srevp = {0x7ff05d2d72f8, 0x7ff05d253010} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #13 0x0000000000469afa in run_actions (h=0x7ffd7df6aee0, a=0x7ff05d2dc010, msg=0x7ff05d30ca28) at core/action.c:1552 t = 0x7ff05d2dc010 ret = -1 mod = 0xb954d573fe87d900 ms = 0 __FUNCTION__ = "run_actions" #14 0x000000000045cc6c in do_action (h=0x7ffd7df6aee0, a=0x7ff05d2deab8, msg=0x7ff05d30ca28) at core/action.c:1045 ret = 1 v = 1 dst = {send_sock = 0x2020200a2922676e, to = {s = {sa_family = 8224, sa_data = " end\n pos"}, sin = {sin_family = 8224, sin_port = 25888, sin_addr = {s_addr = 537551982}, sin_zero = " pos"}, sin6 = {sin6_family = 8224, sin6_port = 25888, sin6_flowinfo = 537551982, sin6_addr = {__in6_u = {__u6_addr8 = " posix.close", __u6_addr16 = {8224, 8224, 28704, 29551, 30825, 25390, 28524, 25971}, __u6_addr32 = {538976288, 1936683040, 1663989865, 1702063980}}}, sin6_scope_id = 1701980192}}, id = 1717527649, proto = 40 '(', send_flags = {f = 202 '\312', blst_imask = 48 '0'}} tmp = 0x206c696e203d3d20 <error: Cannot access memory at address 0x206c696e203d3d20> new_uri = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s" end = 0x7ffd7df6b7d0 "\r" crt = 0x7ff05d2cb210 "handle_packet" cmd = 0x7ff05d2b3568 len = 538976288 user = 538976288 uri = {user = {s = 0x665f65706970202c <error: Cannot access memory at address 0x665f65706970202c>, len = 539568494}, passwd = {s = 0x7720657372756365 <error: Cannot access memory at address 0x7720657372756365>, len = 543716457}, host = {s = 0x726120676e696e69 <error: Cannot access memory at address 0x726120676e696e69>, len = 1701672295}, port = {s = 0x65736c6520202020 <error: Cannot access memory at address 0x65736c6520202020>, len = 539831584}, params = { s = 0x65636f727020746e <error: Cannot access memory at address 0x65636f727020746e>, len = 537555827}, sip_params = {s = 0x74735f6576617320 <error: Cannot access memory at address 0x74735f6576617320>, len = 1953853284}, headers = {s = 0x7075642e7869736f <error: Cannot access memory at address 0x7075642e7869736f>, len = 1869621280}, port_no = 21587, proto = 20292, type = 1180652629, flags = (URI_USER_NORMALIZE | unknown: 1313164360), transport = { s = 0x2066692020202020 <error: Cannot access memory at address 0x2066692020202020>, len = 544501614}, ttl = {s = 0x2074756f6474735f <error: Cannot access memory at address 0x2074756f6474735f>, len = 1852139636}, user_param = { s = 0x6569642020202020 <error: Cannot access memory at address 0x6569642020202020>, len = 1696737312}, maddr = {s = 0x676e692d70756420 <error: Cannot access memory at address 0x676e692d70756420>, len = 537536802}, method = { s = 0x2020200a646e6520 <error: Cannot access memory at address 0x2020200a646e6520>, len = 1763713056}, lr = {s = 0x2e7869736f702074 <error: Cannot access memory at address 0x2e7869736f702074>, len = 846230884}, r2 = { s = 0x202c64665f657469 <error: Cannot access memory at address 0x202c64665f657469>, len = 1769172848}, gr = {s = 0x4c49465f54554f44 <error: Cannot access memory at address 0x4c49465f54554f44>, len = 693063237}, transport_val = { s = 0x2020202020200a6e <error: Cannot access memory at address 0x2020202020200a6e>, len = 1768169504}, ttl_val = {s = 0x756420726f727265 <error: Cannot access memory at address 0x756420726f727265>, len = 1764569712}, user_param_val = {s = 0x652020202020200a <error: Cannot access memory at address 0x652020202020200a>, len = 537551982}, maddr_val = {s = 0x632e7869736f7020 <error: Cannot access memory at address 0x632e7869736f7020>, len = 1702063980}, method_val = {s = 0x7ff05d2b94c0 "\267\344\360W\360\177", len = 538976288}, lr_val = {s = 0x65736f6c632e7869 <error: Cannot access memory at address 0x65736f6c632e7869>, len = 1920411680}, r2_val = { s = 0x202020200a296466 <error: Cannot access memory at address 0x202020200a296466>, len = 174354021}, gr_val = {s = 0x636f6c20200a0a64 <error: Cannot access memory at address 0x636f6c20200a0a64>, len = 1914727521}} next_hop = {user = {s = 0x6e776170732e4d20 <error: Cannot access memory at address 0x6e776170732e4d20>, len = 1534339104}, passwd = {s = 0x746f6e2066692020 <error: Cannot access memory at address 0x746f6e2066692020>, len = 1952805408}, host = {s = 0x6964202020200a6e <error: Cannot access memory at address 0x6964202020200a6e>, len = 573055077}, port = {s = 0x726f66206e692072 <error: Cannot access memory at address 0x726f66206e692072>, len = 1919885419}, params = {s = 0x6e6520200a292274 <error: Cannot access memory at address 0x6e6520200a292274>, len = 538970724}, sip_params = {s = 0x2065736f6c632e78 <error: Cannot access memory at address 0x2065736f6c632e78>, len = 1936683048}, headers = {s = 0xb554f4454 <error: Cannot access memory at address 0xb554f4454>, len = 1563353520}, port_no = 26912, proto = 8294, type = 1042314275, flags = (unknown: 1563353528), transport = { s = 0x7ff05d2eea30 "\034d\036Z]\025\r", len = 4291248}, ttl = {s = 0x7ffd7df69790 "\320\227\366}\375\177", len = 4522002}, user_param = {s = 0x6961772e7869736f <error: Cannot access memory at address 0x6961772e7869736f>, len = 1881677940}, maddr = {s = 0x7ff05d2ee1b0 "172.20.40.5", len = 10717792}, method = {s = 0x297075642e <error: Cannot access memory at address 0x297075642e>, len = 1563476872}, lr = { s = 0x7ffd7df697d0 "\020\230\366}\375\177", len = 4525774}, r2 = {s = 0x7ffd7df698e0 "", len = 2113312832}, gr = {s = 0x2065696420202020 <error: Cannot access memory at address 0x2065696420202020>, len = 1563476872}, transport_val = {s = 0x7ff05d30c3b0 "", len = 1563478568}, ttl_val = {s = 0x7ffd7df69810 "`\230\366}\375\177", len = 4528003}, user_param_val = {s = 0x7ff05d2c9478 "\310\246+]\360\177", len = 2113312992}, maddr_val = { s = 0x7ffd7df69840 "", len = 2113312816}, method_val = {s = 0x646e650a74657220 <error: Cannot access memory at address 0x646e650a74657220>, len = 1563476912}, lr_val = {s = 0x7ffd7df69860 "\260zA", len = 1463997149}, r2_val = { s = 0x66726550202d0056 <error: Cannot access memory at address 0x66726550202d0056>, len = 2113312992}, gr_val = {s = 0x7ffd7df69860 "\260zA", len = 1463997228}} u = 0xd port = 0 dst_host = 0x7ff05d2eea30 i = 1646403616 flags = 170664549 avp = 0x6620726f72726522 st = {flags = 1563206568, id = 32752, name = {n = 1563478568, s = {s = 0x7ff05d30ca28 "\243\221d", len = 2113313424}, re = 0x7ff05d30ca28}, avp = 0x45cd85 <do_action+31624>} sct = 0x0 sjt = 0x7ffd7df694c0 rve = 0x7ff05d2d90a8 mct = 0x7ff057e9815f <w_app_lua_run0+60> rv = 0x6469702066692020 rv1 = 0xb954d573fe87d900 c1 = {cache_type = 1563209688, val_type = 32752, c = {avp_val = {n = 2113313664, s = {s = 0x7ffd7df69b80 "", len = 1600484457}, re = 0x7ffd7df69b80}, pval = {rs = {s = 0x7ffd7df69b80 "", len = 1600484457}, ri = 538976288, flags = 1936662560}}, i2s = ".exit (pipeline (list."} s = {s = 0x6461657228203270 <error: Cannot access memory at address 0x6461657228203270>, len = 0} srevp = {0x7ff05d30ca28, 0x0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #15 0x0000000000469afa in run_actions (h=0x7ffd7df6aee0, a=0x7ff05d2d6828, msg=0x7ff05d30ca28) at core/action.c:1552 t = 0x7ff05d2deab8 ret = 1 mod = 0xb954d573fe87d900 ms = 0 __FUNCTION__ = "run_actions" #16 0x000000000045958d in do_action (h=0x7ffd7df6aee0, a=0x7ff05d2cdb18, msg=0x7ff05d30ca28) at core/action.c:678 ret = -5 v = 1948786802 dst = {send_sock = 0x24, to = {s = {sa_family = 51752, sa_data = "0]\360\177\000\000\330\257,]\360\177\000"}, sin = {sin_family = 51752, sin_port = 23856, sin_addr = {s_addr = 32752}, sin_zero = "\330\257,]\360\177\000"}, sin6 = { sin6_family = 51752, sin6_port = 23856, sin6_flowinfo = 32752, sin6_addr = {__in6_u = {__u6_addr8 = "\330\257,]\360\177\000\000\340\256\366}\375\177\000", __u6_addr16 = {45016, 23852, 32752, 0, 44768, 32246, 32765, 0}, __u6_addr32 = {1563209688, 32752, 2113318624, 32765}}}, sin6_scope_id = 2}}, id = 0, proto = 0 '\000', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} tmp = 0x0 new_uri = 0x7ff05d30ca28 "\243\221d" end = 0x17df6aee0 <error: Cannot access memory at address 0x17df6aee0> crt = 0x2030203d00000005 <error: Cannot access memory at address 0x2030203d00000005> cmd = 0x7ff000000000 len = 1717527920 user = 537536878 uri = {user = {s = 0x1724f6716c27b034 <error: Cannot access memory at address 0x1724f6716c27b034>, len = 1981263924}, passwd = {s = 0x7ffd00000000 <error: Cannot access memory at address 0x7ffd00000000>, len = 1562718224}, host = { s = 0x7ffd7df69d70 "\200\345,]\360\177", len = 1562718224}, port = {s = 0x7ffd7df69c50 "\200\234\366}\375\177", len = 1533206860}, params = {s = 0x7ffd7df69d70 "\200\345,]\360\177", len = 0}, sip_params = { s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 16004968}, headers = {s = 0x5dfb0 <error: Cannot access memory at address 0x5dfb0>, len = 772248}, port_no = 56952, proto = 11, type = ERROR_URI_T, flags = (unknown: 8), transport = {s = 0x41 <error: Cannot access memory at address 0x41>, len = -24651520}, ttl = {s = 0x7ffd7df69c80 "@\235\366}\375\177", len = -24651520}, user_param = { s = 0x7ffd7df69d50 "\300\235\366}\375\177", len = 4381807}, maddr = {s = 0x7ff05d2ee268 "\020", len = 0}, method = {s = 0x7ffd7df69d40 "pz,]\360\177", len = 0}, lr = {s = 0x7ff05d2cb6f8 "\004", len = 2113314516}, r2 = { s = 0x7ff05d30ca28 "\243\221d", len = 2113318624}, gr = {s = 0x7ffd7df69d20 "\230\345,]\360\177", len = 0}, transport_val = {s = 0x7ff05d2ee1b0 "172.20.40.5", len = 2113314288}, ttl_val = {s = 0x0, len = 1563478568}, user_param_val = {s = 0x8968 <error: Cannot access memory at address 0x8968>, len = 2113314352}, maddr_val = {s = 0x7ff05d2ccf70 "\001", len = 1563478568}, method_val = {s = 0x7ffd7df69d50 "\300\235\366}\375\177", len = 1520823051}, lr_val = {s = 0x0, len = 2113314352}, r2_val = {s = 0x7ff05d2ce598 "\001", len = 1563478568}, gr_val = {s = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s", len = 0}} next_hop = {user = {s = 0x7ff05d2c7a70 "\b{,]\360\177", len = -24651520}, passwd = {s = 0x7ffd7df69dc0 "P\236\366}\375\177", len = 5981733}, host = {s = 0x0, len = 2113314352}, port = {s = 0x7ff05d2ce580 "\017", len = 1563478568}, params = {s = 0x7ff05d2cb6f0 "\001", len = 0}, sip_params = {s = 0x7ff05d30ca28 "\243\221d", len = 1563355696}, headers = {s = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s", len = 5989420}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = (unknown: 2113314352), transport = {s = 0x7ffd7df69e50 "\200\236\366}\375\177", len = 4399688}, ttl = {s = 0x7ffd00000025 <error: Cannot access memory at address 0x7ffd00000025>, len = 0}, user_param = {s = 0x7ff05d2ce578 "\a", len = 2113314824}, maddr = {s = 0x7ff05d30ca28 "\243\221d", len = 2113318624}, method = {s = 0x400000000 <error: Cannot access memory at address 0x400000000>, len = -24651520}, lr = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 1397494312}, r2 = {s = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s", len = 2113320912}, gr = {s = 0x0, len = 0}, transport_val = { s = 0x0, len = -24651520}, ttl_val = {s = 0x7ffd7df69e80 "\260\237\366}\375\177", len = 4399820}, user_param_val = {s = 0x7ff05d2ce570 "\001", len = 2113314824}, maddr_val = {s = 0x7ff05d30ca28 "\243\221d", len = 2113318624}, method_val = {s = 0x7ffd7df69fb0 "\200\245\366}\375\177", len = 4405224}, lr_val = {s = 0x6d80 <error: Cannot access memory at address 0x6d80>, len = 2113314608}, r2_val = {s = 0x7ff05d2c9398 "\017", len = 28}, gr_val = { s = 0x7ff05d2cf3d0 "!", len = 2113314824}} u = 0x207000 port = 25972 dst_host = 0x7ffd7df69b80 i = 4 flags = 1768955948 avp = 0x209000 st = {flags = 0, id = 0, name = {n = 0, s = {s = 0x0, len = 2113313888}, re = 0x0}, avp = 0x46a1b1 <run_actions_safe+169>} sct = 0x2020202000000030 sjt = 0x0 rve = 0x7ff05d2cafd8 mct = 0x5b rv = 0x78e8 rv1 = 0x7ff05d30ca28 c1 = {cache_type = RV_CACHE_EMPTY, val_type = RV_NONE, c = {avp_val = {n = 1, s = {s = 0x7ff000000001 <error: Cannot access memory at address 0x7ff000000001>, len = 1563355696}, re = 0x7ff000000001}, pval = {rs = { s = 0x7ff000000001 <error: Cannot access memory at address 0x7ff000000001>, len = 1563355696}, ri = 1877454900, flags = 388298353}}, i2s = "\260zA\000\000\000\000\000\320\267\366}\375\177\000\000\000\000\000\000\000"} s = {s = 0x0, len = 1563355696} srevp = {0x417ab0 <_start>, 0x7ffd7df6b7d0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #17 0x0000000000469afa in run_actions (h=0x7ffd7df6aee0, a=0x7ff05d2cdb18, msg=0x7ff05d30ca28) at core/action.c:1552 t = 0x7ff05d2cdb18 ret = -1 mod = 0xb954d573fe87d900 ms = 0 __FUNCTION__ = "run_actions" #18 0x000000000045cc6c in do_action (h=0x7ffd7df6aee0, a=0x7ff05d2cdc68, msg=0x7ff05d30ca28) at core/action.c:1045 ret = 1 v = 1 dst = {send_sock = 0x7ff051355f71, to = {s = {sa_family = 45108, sa_data = "\347\033q\366$\027\064\260EL\331\260>\027"}, sin = {sin_family = 45108, sin_port = 7143, sin_addr = {s_addr = 388298353}, sin_zero = "4\260EL\331\260>\027"}, sin6 = {sin6_family = 45108, sin6_port = 7143, sin6_flowinfo = 388298353, sin6_addr = {__in6_u = {__u6_addr8 = "4\260EL\331\260>\027\000\000\000\000\000\000\000", __u6_addr16 = {45108, 19525, 45273, 5950, 0, 0, 0, 0}, __u6_addr32 = {1279635508, 389984473, 0, 0}}}, sin6_scope_id = 0}}, id = 0, proto = 104 'h', send_flags = {f = 170 '\252', blst_imask = 231 '\347'}} tmp = 0x0 new_uri = 0x7ffd7df6a380 "\360\314\343\001" end = 0x0 crt = 0x1d08580 "" cmd = 0x7ff05d2b3568 len = 7 user = 0 uri = {user = {s = 0x7ffd7df6a400 "", len = 1580671501}, passwd = {s = 0x0, len = 0}, host = {s = 0x7ffd7df6a100 "0\242\366}\375\177", len = 2113585744}, port = { s = 0x2000000000 <error: Cannot access memory at address 0x2000000000>, len = 0}, params = {s = 0x0, len = 30427152}, sip_params = {s = 0x7ffd7df6a250 "", len = 1362444288}, headers = {s = 0x7ff051359358 "HF!", len = 31958800}, port_no = 7, proto = 0, type = ERROR_URI_T, flags = (URI_SIP_USER_PHONE | unknown: 1587695352), transport = {s = 0x1e7a710 "", len = 1587696341}, ttl = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 1587686988}, user_param = {s = 0x0, len = -2009157508}, maddr = {s = 0x1e35b60 "", len = 2113317104}, method = {s = 0x7ff05e3b91c4 "[%d]", len = 1580962247}, lr = {s = 0x0, len = 1579802473}, r2 = {s = 0x7ff05e257d28 "", len = 1579538456}, gr = {s = 0x7ffd7df6a480 "\200v\354\001", len = 35715777}, transport_val = {s = 0x7ffd7df6a450 " \221;^\360\177", len = 31959656}, ttl_val = {s = 0x0, len = 1589831120}, user_param_val = { s = 0x7ff05e29f99a <vfprintf+22490> "\200\275(\373\377\377", len = 4253399}, maddr_val = {s = 0x7ff05e264d78 "", len = 4210936}, method_val = {s = 0x1e3ccf0 "", len = 2113317248}, lr_val = {s = 0x7ff05e3b91c4 "[%d]", len = 1580962247}, r2_val = {s = 0x0, len = 1579802473}, gr_val = {s = 0x1d859 <error: Cannot access memory at address 0x1d859>, len = 10}} next_hop = {user = {s = 0x7ffd7df6a510 "", len = 1579983518}, passwd = {s = 0x1e35b60 "", len = 2113317328}, host = {s = 0x7c7a7f "%s: %s%s(): bad cseq\n", len = 8157831}, port = { s = 0x7ff05e29f99a <vfprintf+22490> "\200\275(\373\377\377", len = 1579802473}, params = {s = 0x0, len = 0}, sip_params = {s = 0x7ffd7df6a560 "\260zA", len = 1579809178}, headers = {s = 0x0, len = 1579809178}, port_no = 0, proto = 0, type = 32765, flags = (URI_SIP_USER_PHONE | unknown: 4294967288), transport = {s = 0x1d859 <error: Cannot access memory at address 0x1d859>, len = 10}, ttl = {s = 0x7ff05e3b9120 " != ((void *)0)", len = 1579983518}, user_param = {s = 0x1e3ccf0 "", len = 2113317472}, maddr = {s = 0x7d4720 "%s: %s%s(): bad cseq\n", len = 8210216}, method = {s = 0x1ec7680 " \206\330\001", len = 2113317504}, lr = {s = 0x7ff05e3b91c4 "[%d]", len = 1580962247}, r2 = {s = 0x0, len = 1579802473}, gr = {s = 0x7ffd00000000 <error: Cannot access memory at address 0x7ffd00000000>, len = 1579809178}, transport_val = {s = 0x7ffd7df6a610 "\260zA", len = 1580962245}, ttl_val = { s = 0x7ffd7df6a5c0 "p\241,]\360\177", len = 8}, user_param_val = {s = 0x7ff05e3b91c8 "", len = 0}, maddr_val = {s = 0x7ff05e29f99a <vfprintf+22490> "\200\275(\373\377\377", len = 10}, method_val = { s = 0xa726f7200000005 <error: Cannot access memory at address 0xa726f7200000005>, len = 1579809178}, lr_val = {s = 0x7ffd00000000 <error: Cannot access memory at address 0x7ffd00000000>, len = 0}, r2_val = { s = 0xb00000000 <error: Cannot access memory at address 0xb00000000>, len = 0}, gr_val = {s = 0x400000000 <error: Cannot access memory at address 0x400000000>, len = 1513578687}} u = 0x7ff051355cb0 port = 4391 dst_host = 0x1000000bd i = 144 flags = 0 avp = 0x7ff057c5cb90 st = {flags = 1, id = 32765, name = {n = 0, s = {s = 0x0, len = 1}, re = 0x0}, avp = 0x1e7a710} sct = 0x1e7aa68 sjt = 0x7ffd7df6a380 rve = 0x7ff05d2cf3d0 mct = 0x1e7a710 rv = 0x0 rv1 = 0x7ff051355670 c1 = {cache_type = 31961328, val_type = RV_NONE, c = {avp_val = {n = 2113315360, s = {s = 0x7ffd7df6a220 "\377\377\377\377", len = 1}, re = 0x7ffd7df6a220}, pval = {rs = {s = 0x7ffd7df6a220 "\377\377\377\377", len = 1}, ri = 1362451632, flags = 32752}}, i2s = "\377\377\377\377\000\000\000\000\020\247\347\001\000\000\000\000\210\307\305W\360\177"} s = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 1587689837} srevp = {0x0, 0x0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #19 0x0000000000469afa in run_actions (h=0x7ffd7df6aee0, a=0x7ff05d2ca170, msg=0x7ff05d30ca28) at core/action.c:1552 t = 0x7ff05d2cdc68 ret = 1 mod = 0x0 ms = 0 __FUNCTION__ = "run_actions" #20 0x000000000045958d in do_action (h=0x7ffd7df6aee0, a=0x7ff05d2c4920, msg=0x7ff05d30ca28) at core/action.c:678 ret = -5 v = 20 dst = {send_sock = 0x1000000, to = {s = {sa_family = 15624, sa_data = "\364\000\000\000\000\000\020\332\005\000\000\000\000"}, sin = {sin_family = 15624, sin_port = 244, sin_addr = {s_addr = 0}, sin_zero = "\020\332\005\000\000\000\000"}, sin6 = {sin6_family = 15624, sin6_port = 244, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\020\332\005\000\000\000\000\000\370\302\v\000\000\000\000", __u6_addr16 = { 55824, 5, 0, 0, 49912, 11, 0, 0}, __u6_addr32 = {383504, 0, 770808, 0}}}, sin6_scope_id = 777848}}, id = 0, proto = 105 'i', send_flags = {f = 73 'I', blst_imask = 102 'f'}} tmp = 0x1ff4 <error: Cannot access memory at address 0x1ff4> new_uri = 0x1d0f0b0 "CET" end = 0x7ffd7df6a830 "\220\250\366}\375\177" crt = 0x6 <error: Cannot access memory at address 0x6> cmd = 0x7ff05d2b3568 len = 0 user = 0 uri = {user = {s = 0x7ffd7df6a900 "", len = 1562718224}, passwd = {s = 0x40005d8b0 <error: Cannot access memory at address 0x40005d8b0>, len = 1562718224}, host = {s = 0x7ffd7df6a940 "p\251\366}\375\177", len = 1533206860}, port = { s = 0x7ffd7df6a9e0 "\300\250.]\360\177", len = 0}, params = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 16005136}, sip_params = {s = 0x5df08 <error: Cannot access memory at address 0x5df08>, len = 772080}, headers = {s = 0xbde78 <error: Cannot access memory at address 0xbde78>, len = 8}, port_no = 67, proto = 0, type = ERROR_URI_T, flags = (unknown: 4270315776), transport = {s = 0x7ffd7df6a970 " \252\366}\375\177", len = 4842663}, ttl = {s = 0x0, len = 8092224}, user_param = {s = 0x7ffd7df6aa20 "0\253\366}\375\177", len = 0}, maddr = {s = 0x7ffd7df6aa20 "0\253\366}\375\177", len = 6671236}, method = { s = 0x40005dc00 <error: Cannot access memory at address 0x40005dc00>, len = 8189744}, lr = {s = 0x7cd200 "core", len = -24651520}, r2 = {s = 0x7cf090 <__FUNCTION__.6198> "parse_to_param", len = 8181208}, gr = { s = 0x30 <error: Cannot access memory at address 0x30>, len = 1562718224}, transport_val = {s = 0x600000000 <error: Cannot access memory at address 0x600000000>, len = 1}, ttl_val = {s = 0x7ffd7df6aa90 " \254\366}\375\177", len = 1562718224}, user_param_val = {s = 0x7ff05d2ea8c0 "0", len = -24651520}, maddr_val = {s = 0x7ffd7df6aadb "]\360\177", len = 1563355696}, method_val = {s = 0x400417ab0 <error: Cannot access memory at address 0x400417ab0>, len = 8180224}, lr_val = {s = 0x0, len = -24651520}, r2_val = {s = 0x7ffd7df6ab30 "@", len = 6919225}, gr_val = {s = 0x800000000 <error: Cannot access memory at address 0x800000000>, len = 1}} next_hop = {user = {s = 0x0, len = 2113317744}, passwd = {s = 0x5d30f1e8 <error: Cannot access memory at address 0x5d30f1e8>, len = 1563487888}, host = {s = 0xa39866 <buf+1254> "", len = 10720755}, port = { s = 0x400417ab0 <error: Cannot access memory at address 0x400417ab0>, len = 351336240}, params = {s = 0x1d <error: Cannot access memory at address 0x1d>, len = 10720488}, sip_params = {s = 0x7ffd7df6ac20 "0\255\366}\375\177", len = 7028980}, headers = {s = 0x0, len = 8092224}, port_no = 43888, proto = 32246, type = 32765, flags = (URI_USER_NORMALIZE | unknown: 6703464), transport = {s = 0x7ffd7df6ab00 "", len = 1562718224}, ttl = { s = 0xa3964a <buf+714> "low: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE\r\nSupported: replaces\r\nContact: <sip:4923256980@217.10.77.115:5060>\r\nContent-Type: application/sdp\r\nContent-Leng"..., len = 1562718224}, user_param = {s = 0x7ffd7df6ab40 "\210\025.]\360\177", len = 1533206860}, maddr = {s = 0x0, len = 0}, method = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 16004952}, lr = { s = 0x5dfc0 <error: Cannot access memory at address 0x5dfc0>, len = 772264}, r2 = {s = 0xbde78 <error: Cannot access memory at address 0xbde78>, len = 8}, gr = {s = 0x40 <error: Cannot access memory at address 0x40>, len = 7124329}, transport_val = {s = 0x7ff05d2e1588 "\001", len = 1563301240}, ttl_val = {s = 0x0, len = 8092224}, user_param_val = {s = 0x7ffd7df6ac20 "0\255\366}\375\177", len = 1563355696}, maddr_val = { s = 0x417ab0 <_start> "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\220\204s", len = 2113320912}, method_val = {s = 0xa39866 <buf+1254> "", len = 10720838}, lr_val = {s = 0x7ffd7df6ac20 "0\255\366}\375\177", len = 6839005}, r2_val = {s = 0x7d6faa <__FUNCTION__.6418> "get_hdr_field", len = 1563301216}, gr_val = {s = 0xa39866 <buf+1254> "", len = 10720826}} u = 0x157842ad1 port = 65535 dst_host = 0x7ffd7df6a9cf i = 2 flags = 0 avp = 0x7ffd7df6aa40 st = {flags = 2113317008, id = 32765, name = {n = 1533206860, s = {s = 0x7ff05b62e14c <pkg_proc_update_stats+130> "H\213\r\225M ", len = 6}, re = 0x7ff05b62e14c <pkg_proc_update_stats+130>}, avp = 0x0} sct = 0x7ff000000001 sjt = 0x7ffd7df6aee2 rve = 0x7ff05e5f7300 mct = 0x664969 <qm_info+46> rv = 0x7ffd00000000 rv1 = 0x7ffd7df6a810 c1 = {cache_type = 2113317056, val_type = 32765, c = {avp_val = {n = 1562718224, s = {s = 0x7ff05d253010 "\001", len = 2113317056}, re = 0x7ff05d253010}, pval = {rs = {s = 0x7ff05d253010 "\001", len = 2113317056}, ri = 1562718224, flags = 32752}}, i2s = "\000\251\366}\375\177\000\000L\341b[\360\177\000\000p\251\366}\375\177"} s = {s = 0x7ffd7df6a850 "", len = 1562718224} srevp = {0x39327df6ae90, 0x7ff05d253010} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #21 0x0000000000469afa in run_actions (h=0x7ffd7df6aee0, a=0x7ff05d2c39c0, msg=0x7ff05d30ca28) at core/action.c:1552 t = 0x7ff05d2c4920 ret = 1 mod = 0xb954d57300000000 ms = 0 __FUNCTION__ = "run_actions" #22 0x000000000046a2bd in run_top_route (a=0x7ff05d2c39c0, msg=0x7ff05d30ca28, c=0x7ffd7df6aee0) at core/action.c:1641 ctx = {rec_lev = 1563492736, run_flags = 32752, last_retcode = -24651520, jmp_env = {{__jmpbuf = {4291248, 140670332234288, 4291248, 140726716774352, 0, 0, 140726716727328, 4302026204}, __mask_was_saved = 2113318256, __saved_mask = { __val = {140670302069697, 4294967416, 32, 32, 140670331596816, 140726716771744, 140670302070636, 0, 0, 4611686037170749880, 140670332357160, 140726716771792, 5298061, 12889193136, 140670332357160, 4611686035607257088}}}}} p = 0x7ffd7df6aee0 ret = 32752 sfbk = 0 #23 0x0000000000580a69 in receive_msg ( buf=0xa393f7 <buf+119> "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 172.20.40.5;branch=z9hG4bKe877.99be6a0f42b6af42ea04ccf5096212f6.0;received=172.20.40.5\r\nVia: SIP/2.0/UDP 217.10.68.147;branch=z9hG4bKe877.e34c617b86d11387c957efc71c542"..., len=1135, rcv_info=0x7ffd7df6b0f0) at core/receive.c:327 msg = 0x7ff05d30ca28 ctx = {rec_lev = 5, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {140670332234288, 1667728727226167348, 4291248, 140726716774352, 0, 0, 1667728727247138868, -1666880443433635788}, __mask_was_saved = 0, __saved_mask = { __val = {140670332234288, 4291248, 140726716774352, 140726716772288, 140670275555975, 140670275624576, 169010473594, 140726716772376, 96052620480, 11417664, 0, 152437174176, 140668768878608, 4291248, 140670332234288, 4291248}}}}} bctx = 0x664969 <qm_info+46> ret = 1 stats_on = 0 tvb = {tv_sec = 140726716772048, tv_usec = 140670331596816} tve = {tv_sec = 140726716772096, tv_usec = 140670331596816} tz = {tz_minuteswest = 9, tz_dsttime = 0} diff = 0 inb = { s = 0xa393f7 <buf+119> "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 172.20.40.5;branch=z9hG4bKe877.99be6a0f42b6af42ea04ccf5096212f6.0;received=172.20.40.5\r\nVia: SIP/2.0/UDP 217.10.68.147;branch=z9hG4bKe877.e34c617b86d11387c957efc71c542"..., len = 1135} netinfo = {data = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 0}, dst = 0x1000000, rcv = 0xf44700} keng = 0x0 __FUNCTION__ = "receive_msg" #24 0x00007ff059ce4cdf in parsing_hepv3_message (buf=0xa39380 <buf> "HEP3\004\346", len=1254) at hep.c:499 from = {s = {sa_family = 2, sa_data = "\023\304\331\nMs\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 1934428889}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 1934428889, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}} to = {s = {sa_family = 2, sa_data = "\023\304\254\024(\005\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 86512812}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 86512812, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}} ri = {src_ip = {af = 2, len = 4, u = {addrl = {140670703307481, 0}, addr32 = {1934428889, 32752, 0, 0}, addr16 = {2777, 29517, 32752, 0, 0, 0, 0, 0}, addr = "\331\nMs\360\177\000\000\000\000\000\000\000\000\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {140724689966252, 140726716772656}, addr32 = {86512812, 32765, 2113319216, 32765}, addr16 = {5292, 1320, 32765, 0, 45360, 32246, 32765, 0}, addr = "\254\024(\005\375\177\000\000\060\261\366}\375\177\000"}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 4254168, src_su = {s = {sa_family = 2, sa_data = "\023\304\331\nMs\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = { s_addr = 1934428889}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 1934428889, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7ff05d2eaca8, proto = 1 '\001'} tmp = 0xa393f1 <buf+113> "" dst_ip = {af = 2, len = 4, u = {addrl = {140668855391404, 140726716772816}, addr32 = {86512812, 32752, 2113319376, 32765}, addr16 = {5292, 1320, 32752, 0, 45520, 32246, 32765, 0}, addr = "\254\024(\005\360\177\000\000\320\261\366}\375\177\000"}} src_ip = {af = 2, len = 4, u = {addrl = {140670703307481, 1}, addr32 = {1934428889, 32752, 1, 0}, addr16 = {2777, 29517, 32752, 0, 1, 0, 0, 0}, addr = "\331\nMs\360\177\000\000\001\000\000\000\000\000\000"}} si = 0x7ff05d2eaca8 tmp_len = 4 i = 1254 payload = 0xa393f7 <buf+119> "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 172.20.40.5;branch=z9hG4bKe877.99be6a0f42b6af42ea04ccf5096212f6.0;received=172.20.40.5\r\nVia: SIP/2.0/UDP 217.10.68.147;branch=z9hG4bKe877.e34c617b86d11387c957efc71c542"... payload_len = 1135 chunk = 0xa393f1 <buf+113> hg = 0x7ff05d2eabb8 totelem = 11 chunk_vendor = 0 chunk_type = 15 chunk_length = 1141 total_length = 1254 __FUNCTION__ = "parsing_hepv3_message" #25 0x00007ff059ce3264 in hepv3_received (buf=0xa39380 <buf> "HEP3\004\346", len=1254, ri=0x7ffd7df6b330) at hep.c:231 __FUNCTION__ = "hepv3_received" #26 0x00007ff059ce19cb in hep_msg_received (data=0x7ffd7df6b310) at hep.c:85 srevp = 0x7ffd7df6b310 buf = 0xa39380 <buf> "HEP3\004\346" len = 0x7ffd7df6b2e4 ri = 0x7ffd7df6b330 __FUNCTION__ = "hep_msg_received" heph = 0xa39380 <buf> #27 0x000000000049e4e1 in sr_event_exec (type=7, data=0x7ffd7df6b310) at core/events.c:263 ret = 0 i = 7 #28 0x000000000048731a in udp_rcv_loop () at core/udp_server.c:466 sredp = {0xa39380 <buf>, 0x7ffd7df6b2e4, 0x7ffd7df6b330} len = 1254 buf = "HEP3\004\346\000\000\000\001\000\a\002\000\000\000\002\000\a\021\000\000\000\a\000\b\023\304\000\000\000\b\000\b\023\304\000\000\000\t\000\n\034d\036Z\000\000\000\n\000\n]\025\r\000\000\000\000\v\000\a\001\000\000\000\f\000\n\000\000\000\000\000\000\000\003\000\n\331\nMs\000\000\000\004\000\n\254\024(\005\000\000\000\016\000\024rodauMyHep2001\000\000\000\017\004uSIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 172.20.40.5;branch=z9hG4bKe877.99be6a0f42b6af42e"... tmp = 0x52fe33 <init_child+52> "\311\303UH\211\345AWAVAUATSH\203\354\070H\211}\270H\203}\270" from = 0x7ff05d2edfd8 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {16777343, 140670331935744}, addr32 = {16777343, 0, 1563057152, 32752}, addr16 = {127, 256, 0, 0, 23552, 23850, 32752, 0}, addr = "\177\000\000\001\000\000\000\000\000\\*]\360\177\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, src_port = 36988, dst_port = 9060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\220|\177\000\000\001\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 31888, sin_addr = {s_addr = 16777343}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 31888, sin6_flowinfo = 16777343, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7ff05d2a5a80, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" #29 0x0000000000422d08 in main_loop () at main.c:1623 i = 23 pid = 0 si = 0x7ff05d2a5a80 si_desc = "udp receiver child=23 sock=0.0.0.0:9060\000\000\331\207\376q\000\000\000\261\200u\000\000\000\000\000\000\331\207\376s\325T\271\004\000\000\000\000\000\000\000\246\252\256\066\000\000\000\000\260zA\000\000\000\000\000\320\267\366}\375\177", '\000' <repeats 19 times>, "\265\366}\375\177\000\000!3_\000\000\000\000" nrprocs = 96 woneinit = 1 __FUNCTION__ = "main_loop" #30 0x000000000042a408 in main (argc=13, argv=0x7ffd7df6b7d8) at main.c:2643 cfg_stream = 0x1c95010 c = -1 r = 0 tmp = 0x7ffd7df6befe "" tmp_len = 1579565480 port = 32752 proto = 2113320592 options = 0x73b8f8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1271703746 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x1 <error: Cannot access memory at address 0x1> st = {st_dev = 15, st_ino = 259871, st_nlink = 2, st_mode = 16877, st_uid = 117, st_gid = 122, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1506502981, tv_nsec = 691416812}, st_mtim = { tv_sec = 1511857903, tv_nsec = 184120552}, st_ctim = {tv_sec = 1511857903, tv_nsec = 184120552}, __glibc_reserved = {0, 0, 0}} __FUNCTION__ = "main" No symbol table info available. 1826 main.c: No such file or directory. ``` #### Log Messages The log didn't say anything except this line: ``` ov 29 08:39:09 hostname /usr/sbin/kamailio[121099]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 34 Nov 29 08:39:09 hostname /usr/sbin/kamailio[120885]: ALERT: <core> [main.c:743]: handle_sigs(): child process 120921 exited by a signal 11 Nov 29 08:39:09 hostname /usr/sbin/kamailio[120885]: ALERT: <core> [main.c:746]: handle_sigs(): core was generated ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**:  Kamailio is running on a Debian Jessie system. ``` Linux hostname 3.16.0-4-amd64 #1 SMP Debian 3.16.43-2+deb8u5 (2017-09-19) 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/1342

2 6

[kamailio/kamailio] nat_traversal: handle local generated transactions (#1344)
by lazedo 29 Nov '17

29 Nov '17

when using the below script blocks for handling SUBSCRIBE messages, the nat_keepalive does not work as expected. ``` #!ifdef NAT_TRAVERSAL_ROLE route[PRESENCE_NAT] { force_rport(); if (client_nat_test("3")) { if(is_first_hop()) set_contact_alias(); nat_keepalive(); } } #!endif route[HANDLE_SUBSCRIBE] { if (!is_method("SUBSCRIBE")) { return; } #!ifdef NAT_TRAVERSAL_ROLE route(PRESENCE_NAT); #!endif if (!t_newtran()) { sl_reply_error(); exit; } if(has_totag()) { route(HANDLE_RESUBSCRIBE); } else { route(HANDLE_NEW_SUBSCRIBE); } t_release(); exit; } ``` i believe this should be backported to stable branches Thanks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1344 -- Commit Summary -- * nat_traversal: fix local generated transactions -- File Changes -- M src/modules/nat_traversal/nat_traversal.c (29) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1344.patch https://github.com/kamailio/kamailio/pull/1344.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/1344

2 8

git:master:886f14e1: nat_traversal: handle local generated transactions (#1344)
by Daniel-Constantin Mierla 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: 886f14e11e3e5fe9d2bc56fd37d2102ae5b99645 URL: https://github.com/kamailio/kamailio/commit/886f14e11e3e5fe9d2bc56fd37d2102… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-29T12:00:01+01:00 nat_traversal: handle local generated transactions (#1344) * nat_traversal: fix local generated transactions * nat_traversal: handle TMCB_RESPONSE_SENT only for FAKED_REPLY * nat_traversal: free allocated buffer --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/886f14e11e3e5fe9d2bc56fd37d2102… Patch: https://github.com/kamailio/kamailio/commit/886f14e11e3e5fe9d2bc56fd37d2102… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index ae38d7653b..3ddee233d6 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1358,17 +1358,42 @@ __sl_reply_out(sl_cbp_t *slcbp) static void __tm_reply_in(struct cell *trans, int type, struct tmcb_params *param) { - time_t expire; + time_t expire = 0; if (param->req==NULL || param->rpl==NULL) return; + if(type == TMCB_RESPONSE_SENT && param->rpl!=FAKED_REPLY) + return; + if (param->code >= 200 && param->code < 300) { switch (param->req->REQ_METHOD) { case METHOD_SUBSCRIBE: - expire = get_expires(param->rpl); - if (expire > 0) + if(type == TMCB_RESPONSE_SENT) { + char* tmp = pkg_malloc(param->send_buf.len+1); + if(tmp) { + sip_msg_t msg; + strncpy(tmp, param->send_buf.s, param->send_buf.len); + tmp[param->send_buf.len] = '\0'; + memset(&msg, 0, sizeof(sip_msg_t)); + msg.buf=tmp; + msg.len=param->send_buf.len; + if(parse_msg(tmp, param->send_buf.len, &msg) != 0) { + LM_ERR("ERROR PARSING REPLY\n"); + } else { + expire = get_expires(&msg); + } + free_sip_msg(&msg); + pkg_free(tmp); + } + } else { + expire = get_expires(param->rpl); + } + if (expire > 0) { keepalive_subscription(param->req, expire); + } else { + LM_DBG("expires == 0\n"); + } break; case METHOD_REGISTER: expire = get_register_expire(param->req, param->rpl); @@ -1404,7 +1429,7 @@ NAT_Keepalive(struct sip_msg *msg) // fallthrough case METHOD_SUBSCRIBE: msg->msg_flags |= FL_DO_KEEPALIVE; - if (tm_api.register_tmcb(msg, 0, TMCB_RESPONSE_IN, __tm_reply_in, 0, 0) <= 0) { + if (tm_api.register_tmcb(msg, 0, TMCB_RESPONSE_IN | TMCB_RESPONSE_SENT, __tm_reply_in, 0, 0) <= 0) { LM_ERR("cannot register TM callback for incoming replies\n"); return -1; }

1 0

git:master:75bbbe40: ndb_redis: detect argument specifiers for redis_cmd() with three params
by Daniel-Constantin Mierla 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: 75bbbe4059cb6fde4c74fa9157f400a24e6f7496 URL: https://github.com/kamailio/kamailio/commit/75bbbe4059cb6fde4c74fa9157f400a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-29T10:58:53+01:00 ndb_redis: detect argument specifiers for redis_cmd() with three params - check if %s or %d is part of the command, because it makes the redis api expect more params to the commands and can crash if none is found - reported by GH #1342 --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/75bbbe4059cb6fde4c74fa9157f400a… Patch: https://github.com/kamailio/kamailio/commit/75bbbe4059cb6fde4c74fa9157f400a… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 64f2b46897..e984a902bd 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -177,6 +177,7 @@ static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres) { str s[3]; + int i; if(fixup_get_svalue(msg, (gparam_t*)ssrv, &s[0])!=0) { @@ -188,6 +189,14 @@ static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, LM_ERR("no redis command\n"); return -1; } + for(i=0; i<s[1].len-1; i++) { + if(s[1].s[i]=='%') { + if(s[1].s[i+1]=='s' || s[1].s[i+1]=='b') { + LM_ERR("command argument specifier found, but no params\n"); + return -1; + } + } + } if(fixup_get_svalue(msg, (gparam_t*)sres, &s[2])!=0) { LM_ERR("no redis reply name\n"); @@ -928,6 +937,19 @@ int bind_ndb_redis(ndb_redis_api_t *api) */ static int ki_redis_cmd(sip_msg_t *msg, str *srv, str *rcmd, str *sres) { + int i; + if(rcmd==NULL || rcmd->s==NULL) { + LM_ERR("invalid command\n"); + return -1; + } + for(i=0; i<rcmd->len-1; i++) { + if(rcmd->s[i]=='%') { + if(rcmd->s[i+1]=='s' || rcmd->s[i+1]=='b') { + LM_ERR("command argument specifier found, but no params\n"); + return -1; + } + } + } return redisc_exec(srv, sres, rcmd); } @@ -1007,4 +1029,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_ndb_redis_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:49272f23: presence: update contact in update_subs_db
by lazedo 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: 49272f23b22445415721766709bf5841865e8609 URL: https://github.com/kamailio/kamailio/commit/49272f23b22445415721766709bf584… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-11-29T09:50:51Z presence: update contact in update_subs_db --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/49272f23b22445415721766709bf584… Patch: https://github.com/kamailio/kamailio/commit/49272f23b22445415721766709bf584… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index ee90bf7c85..f199f95c58 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -420,6 +420,13 @@ int update_subs_db(subs_t* subs, int type) update_vals[n_update_cols].nul = 0; update_vals[n_update_cols].val.int_val = subs->updated_winfo; n_update_cols++; + + update_keys[n_update_cols] = &str_contact_col; + update_vals[n_update_cols].type = DB1_STR; + update_vals[n_update_cols].nul = 0; + update_vals[n_update_cols].val.str_val = subs->contact; + n_update_cols++; + } if(type & LOCAL_TYPE) {

1 0

[kamailio/kamailio] presence: update contact in update_subs_db (#1341)
by lazedo 29 Nov '17

29 Nov '17

when using presence with dbmode = 3, the contact is never updated. if using dbmode != 3 the contact is updated in the hash table. we've seen some UAs re-subscribing with a different contact port of the initial subscribe. it works with dbmode != 3 but not with dbmode == 3 this should be backported to 5.0/5.1 branch Thanks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1341 -- Commit Summary -- * presence: update contact in update_subs_db -- File Changes -- M src/modules/presence/subscribe.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1341.patch https://github.com/kamailio/kamailio/pull/1341.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/1341

2 2

git:master:209032fc: ldap: use core fixup function for ldap_search()
by Daniel-Constantin Mierla 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: 209032fc134afb90e4e12b194d1368ed9fb67ee9 URL: https://github.com/kamailio/kamailio/commit/209032fc134afb90e4e12b194d1368e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-29T08:33:38+01:00 ldap: use core fixup function for ldap_search() --- Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/209032fc134afb90e4e12b194d1368e… Patch: https://github.com/kamailio/kamailio/commit/209032fc134afb90e4e12b194d1368e… --- diff --git a/src/modules/ldap/ldap_exp_fn.c b/src/modules/ldap/ldap_exp_fn.c index 77a92c2bf7..c68e00895e 100644 --- a/src/modules/ldap/ldap_exp_fn.c +++ b/src/modules/ldap/ldap_exp_fn.c @@ -52,31 +52,22 @@ static char esc_buf[ESC_BUF_SIZE]; * exported functions */ -int ldap_search_impl(struct sip_msg *_msg, pv_elem_t *_ldap_url) +int ldap_search_impl(struct sip_msg *_msg, str *ldap_url) { - str ldap_url; int ld_result_count = 0; /* * do variable substitution for _ldap_url (pv_printf_s) */ - if(_ldap_url == NULL) { + if(ldap_url == NULL || ldap_url->s==NULL || ldap_url->len<=0) { LM_ERR("empty ldap_url\n"); return -2; } - if(_ldap_url->spec != NULL && _ldap_url->spec->getf != NULL) { - if(pv_printf_s(_msg, _ldap_url, &ldap_url) != 0 || ldap_url.len <= 0) { - LM_ERR("pv_printf_s failed\n"); - return -2; - } - } else { - ldap_url = _ldap_url->text; - } /* * perform LDAP search */ - if(ldap_url_search(ldap_url.s, &ld_result_count) != 0) { + if(ldap_url_search(ldap_url->s, &ld_result_count) != 0) { /* LDAP search error */ return -2; } diff --git a/src/modules/ldap/ldap_exp_fn.h b/src/modules/ldap/ldap_exp_fn.h index 695dbc198e..20d4149de6 100644 --- a/src/modules/ldap/ldap_exp_fn.h +++ b/src/modules/ldap/ldap_exp_fn.h @@ -47,7 +47,7 @@ struct ldap_result_check_params pv_elem_p check_str_elem_p; }; -int ldap_search_impl(struct sip_msg *_msg, pv_elem_t *_ldap_url); +int ldap_search_impl(struct sip_msg *_msg, str *ldap_url); int ldap_write_result(struct sip_msg *_msg, struct ldap_result_params *_lrp, struct subst_expr *_se); diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index f167bcadbb..2364f0a7cf 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -33,6 +33,7 @@ #include "../../core/parser/hf.h" #include "../../core/sr_module.h" #include "../../core/pvar.h" +#include "../../core/mod_fix.h" #include "../../core/mem/mem.h" #include "ld_session.h" @@ -54,7 +55,6 @@ static int child_init(int rank); /* * fixup functions */ -static int ldap_search_fixup(void **param, int param_no); static int ldap_result_fixup(void **param, int param_no); static int ldap_filter_url_encode_fixup(void **param, int param_no); static int ldap_result_check_fixup(void **param, int param_no); @@ -92,7 +92,7 @@ static dictionary *config_vals = NULL; /* clang-format off */ static cmd_export_t cmds[] = { {"ldap_search", (cmd_function)w_ldap_search, 1, - ldap_search_fixup, 0, + fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result1, 1, ldap_result_fixup, 0, @@ -246,7 +246,13 @@ static void destroy(void) static int w_ldap_search(struct sip_msg *msg, char *ldap_url, char *param) { - return ldap_search_impl(msg, (pv_elem_t *)ldap_url); + str ldap_url_val = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)ldap_url, &ldap_url_val)<0) { + LM_ERR("failed to get ldap url parameter\n"); + return -1; + } + return ldap_search_impl(msg, &ldap_url_val); } static int w_ldap_result1(struct sip_msg *msg, char *src, char *param) @@ -291,28 +297,6 @@ static int w_ldap_result_check_2( * FIXUP functions */ -static int ldap_search_fixup(void **param, int param_no) -{ - pv_elem_t *model; - str s; - - if(param_no == 1) { - s.s = (char *)*param; - s.len = strlen(s.s); - if(s.len == 0) { - LM_ERR("ldap url is empty string!\n"); - return E_CFG; - } - if(pv_parse_format(&s, &model) || model == NULL) { - LM_ERR("wrong format [%s] for ldap url!\n", s.s); - return E_CFG; - } - *param = (void *)model; - } - - return 0; -} - static int ldap_result_fixup(void **param, int param_no) { struct ldap_result_params *lp;

1 0

git:master:855d5d0f: ldap: clang format the code
by Daniel-Constantin Mierla 28 Nov '17

28 Nov '17

Module: kamailio Branch: master Commit: 855d5d0f976e89962c541a34690dcb212e127e6b URL: https://github.com/kamailio/kamailio/commit/855d5d0f976e89962c541a34690dcb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-28T17:51:33+01:00 ldap: clang format the code --- Modified: src/modules/ldap/api.h Modified: src/modules/ldap/iniparser.c Modified: src/modules/ldap/iniparser.h Modified: src/modules/ldap/ld_session.c Modified: src/modules/ldap/ld_session.h Modified: src/modules/ldap/ldap_api_fn.c Modified: src/modules/ldap/ldap_api_fn.h Modified: src/modules/ldap/ldap_connect.c Modified: src/modules/ldap/ldap_connect.h Modified: src/modules/ldap/ldap_escape.c Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/855d5d0f976e89962c541a34690dcb2… Patch: https://github.com/kamailio/kamailio/commit/855d5d0f976e89962c541a34690dcb2…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev