sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

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: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: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: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: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: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: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: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

← Newer
1
...
28
29
30
31
32
33
34
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017