sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:9cc9576c: app_python: declare global vars extern in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9cc9576c025c541264a3679618bb2be8d108a9f6 URL: https://github.com/kamailio/kamailio/commit/9cc9576c025c541264a3679618bb2be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T08:27:15+01:00 app_python: declare global vars extern in header file --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/9cc9576c025c541264a3679618bb2be… Patch: https://github.com/kamailio/kamailio/commit/9cc9576c025c541264a3679618bb2be… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index e901c91412..ee832feb3d 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -54,6 +54,8 @@ static void mod_destroy(void); PyObject *_sr_apy_handler_obj = NULL; +PyObject *format_exc_obj = NULL; + char *dname = NULL, *bname = NULL; int _apy_process_rank = 0; diff --git a/src/modules/app_python/python_support.h b/src/modules/app_python/python_support.h index 4d25564119..2a97d16ed8 100644 --- a/src/modules/app_python/python_support.h +++ b/src/modules/app_python/python_support.h @@ -25,7 +25,7 @@ #include <Python.h> #include <stdarg.h> -PyObject *format_exc_obj; +extern PyObject *format_exc_obj; void python_handle_exception(const char *, ...);

4 years, 8 months

git:master:7afe5b98: pua_reginfo: extern declaration of global vars in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7afe5b9837d38cd77f75c3028c9134673c95404e URL: https://github.com/kamailio/kamailio/commit/7afe5b9837d38cd77f75c3028c91346… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-08T20:25:00+01:00 pua_reginfo: extern declaration of global vars in header file --- Modified: src/modules/pua_reginfo/pua_reginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/7afe5b9837d38cd77f75c3028c91346… Patch: https://github.com/kamailio/kamailio/commit/7afe5b9837d38cd77f75c3028c91346… --- diff --git a/src/modules/pua_reginfo/pua_reginfo.h b/src/modules/pua_reginfo/pua_reginfo.h index a15b7e47a8..133191541b 100644 --- a/src/modules/pua_reginfo/pua_reginfo.h +++ b/src/modules/pua_reginfo/pua_reginfo.h @@ -16,8 +16,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,9 +27,9 @@ #include "../pua/pua_bind.h" #include "../usrloc/usrloc.h" -str default_domain; -str outbound_proxy; -str server_address; +extern str default_domain; +extern str outbound_proxy; +extern str server_address; extern usrloc_api_t ul; /*!< Structure containing pointers to usrloc functions*/ extern pua_api_t pua; /*!< Structure containing pointers to PUA functions*/

4 years, 8 months

git:master:b514d330: modules: readme files regenerated - lost ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b514d330012826628f69128fa27afc102934ddc5 URL: https://github.com/kamailio/kamailio/commit/b514d330012826628f69128fa27afc1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-08T09:46:21+01:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/b514d330012826628f69128fa27afc1… Patch: https://github.com/kamailio/kamailio/commit/b514d330012826628f69128fa27afc1… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 357c41d388..d1940ce7e1 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -9,7 +9,7 @@ Edited by Wolfgang Kampichler - Copyright © 20018-2019 Wolfgang Kampichler + Copyright © 20018-2020 Wolfgang Kampichler __________________________________________________________________ Table of Contents @@ -60,9 +60,9 @@ Chapter 1. Admin Guide SIP requests may be forwarded based on a location provided with the request or retrieved from a specific location server using an identity (HELD). This module implements the basic functionality to get or parse - location information and to query a mapping service (LOST) in order to - get next hop based on location and service urn either specified or - provided with the request. + location information (civic and geodetic) and to query a mapping + service (LOST) in order to get next hop based on location and service + urn either specified or provided with the request. This module implements protocol functions that use the http_client api to fetch data from external LOST and HELD servers. The module is using @@ -81,11 +81,11 @@ Chapter 1. Admin Guide The function lost_query allows Kamailio to assemble a LOST findService request as defined in RFC5222 (https://tools.ietf.org/html/rfc5255) to - query routing information for a given (geodetic) location and a service - URN. Both, PIDF-LO and service URN may be provided as function - parameter, or are taken from the request message if applicable. The - findServiceResponse is parsed and represented asdisplay name and SIP - URI typically used as next hop in a Route header. + query routing information for a given (geodetic or civic) location and + a service URN. Both, PIDF-LO and service URN may be provided as + function parameter, or are taken from the request message if + applicable. The findServiceResponse is parsed and represented asdisplay + name and SIP URI typically used as next hop in a Route header. The http_client module use the CURL library setting up connections. The CURL library by default use the system configured DNS resolvers, not @@ -196,24 +196,24 @@ $var(id) = "urn:service:sos"; $var(res) = lost_query("lostsrv", "$var(pidf)", "$var(urn)", "$var(uri)", "$var( name)", "$var(err)"); xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ -var(uri)\n"); +var(name)\n"); ... # LOST findService request - pidf-lo as parameter, urn taken from request line $var(res) = lost_query("lostsrv", "$var(pidf)", "", "$var(uri)", "$var(name)", " $var(err)"); xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ -var(uri)\n"); +var(name)\n"); ... # LOST findService request - urn as parameter, pidf-lo taken from message body $var(res) = lost_query("lostsrv", "", "$var(urn)", "$var(uri)", "$var(name)", "$ var(err)"); xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ -var(uri)\n"); +var(name\n"); ... # LOST findService request - pidf-lo and urn taken from message $var(res) = lost_query("lostsrv", "$var(uri)", "$var(name)", "$var(err)"); xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ -var(uri)\n"); +var(name)\n"); ... 5. Counters @@ -236,5 +236,5 @@ var(uri)\n"); requires query_params.oneline set to 0. In the case lost_query is used with the default http_client API, dereferencing location via HTTP provided with the Geolocation header causes an error. Therefore, to - work properlu=y, it requires to set http_client module parameter + work properly, it requires to set http_client module parameter query_result to 0.

4 years, 8 months

git:master:d4fe0a9a: lost: added civic address parsing via xpath

by wkampich

Module: kamailio Branch: master Commit: d4fe0a9a5c553ca25c9e29ab1eb64f4debd9a91e URL: https://github.com/kamailio/kamailio/commit/d4fe0a9a5c553ca25c9e29ab1eb64f4… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: wkampich <wolfgang.kampichler(a)gmail.com> Date: 2020-03-08T09:23:53+01:00 lost: added civic address parsing via xpath - the pidf-lo parsing function now uses xpath to support geolocation (point, circle) and civic address. - as fall-back (failing xpath or malformed pidf-lo) the the function looks for point or cirle attributes. - besides: README update and code refactoring. --- Modified: src/modules/lost/doc/lost.xml Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/functions.c Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/pidf.h Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/d4fe0a9a5c553ca25c9e29ab1eb64f4… Patch: https://github.com/kamailio/kamailio/commit/d4fe0a9a5c553ca25c9e29ab1eb64f4…

4 years, 8 months

git:master:bc9baca2: jsonrcc: use extern not to declare global variables many times

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bc9baca2229d09b912a51a2e64ead79f709d45fd URL: https://github.com/kamailio/kamailio/commit/bc9baca2229d09b912a51a2e64ead79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-07T13:25:06+01:00 jsonrcc: use extern not to declare global variables many times --- Modified: src/modules/jsonrpcc/jsonrpc_io.c Modified: src/modules/jsonrpcc/jsonrpc_request.c Modified: src/modules/jsonrpcc/jsonrpc_request.h Modified: src/modules/jsonrpcc/jsonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc9baca2229d09b912a51a2e64ead79… Patch: https://github.com/kamailio/kamailio/commit/bc9baca2229d09b912a51a2e64ead79… --- diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c index ebb93348ba..81627659fb 100644 --- a/src/modules/jsonrpcc/jsonrpc_io.c +++ b/src/modules/jsonrpcc/jsonrpc_io.c @@ -58,7 +58,7 @@ struct jsonrpc_server_group { struct jsonrpc_server_group *next_group; }; -struct tm_binds tmb; +extern struct tm_binds tmb; struct jsonrpc_server_group *server_group; diff --git a/src/modules/jsonrpcc/jsonrpc_request.c b/src/modules/jsonrpcc/jsonrpc_request.c index d2321e5f37..63af54dfe1 100644 --- a/src/modules/jsonrpcc/jsonrpc_request.c +++ b/src/modules/jsonrpcc/jsonrpc_request.c @@ -29,7 +29,7 @@ #include "jsonrpc_io.h" -struct tm_binds tmb; +extern struct tm_binds tmb; int memory_error() { LM_ERR("Out of memory!"); diff --git a/src/modules/jsonrpcc/jsonrpc_request.h b/src/modules/jsonrpcc/jsonrpc_request.h index 16114d9aa7..49cfdb46c1 100644 --- a/src/modules/jsonrpcc/jsonrpc_request.h +++ b/src/modules/jsonrpcc/jsonrpc_request.h @@ -26,6 +26,6 @@ int jsonrpc_request(struct sip_msg* msg, char* method, char* params, char* cb_route, char* err_route, char* cb_pv); int jsonrpc_notification(struct sip_msg* msg, char* method, char* params); -int cmd_pipe; +extern int cmd_pipe; #endif /* _JSONRPC_REQUEST_H_ */ diff --git a/src/modules/jsonrpcc/jsonrpcc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c index c5d067b733..062b5b4096 100644 --- a/src/modules/jsonrpcc/jsonrpcc_mod.c +++ b/src/modules/jsonrpcc/jsonrpcc_mod.c @@ -49,6 +49,7 @@ int fixup_pvar_shm(void** param, int param_no); char *servers_param; int pipe_fds[2] = {-1,-1}; +int cmd_pipe = -1; extern int _jsonrpcc_max_conn_retry; /* max retries to connect */

4 years, 8 months

git:master:f2959f42: core: remove compiler warnings [-Wstring-plus-int]

by Victor Seva

Module: kamailio Branch: master Commit: f2959f422bb8171241728f5148d4b21c9cc2c681 URL: https://github.com/kamailio/kamailio/commit/f2959f422bb8171241728f5148d4b21… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-07T12:01:08+01:00 core: remove compiler warnings [-Wstring-plus-int] > core/parser/parse_fline.c:241:17: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > SIP_VERSION+1, SIP_VERSION_LEN-1)) { > ~~~~~~~~~~~^~ > > core/parser/parse_fline.c:241:17: note: use array indexing to silence this warning > SIP_VERSION+1, SIP_VERSION_LEN-1)) { > ^ > & [ ] > core/parser/parse_fline.c:247:18: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { > ~~~~~~~~~~~~^~ > > core/parser/parse_fline.c:247:18: note: use array indexing to silence this warning > HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { > ^ > & [ ] > > 2 warnings generated. --- Modified: src/core/parser/parse_fline.c --- Diff: https://github.com/kamailio/kamailio/commit/f2959f422bb8171241728f5148d4b21… Patch: https://github.com/kamailio/kamailio/commit/f2959f422bb8171241728f5148d4b21… --- diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c index a5aefb7ee8..5016a31d59 100644 --- a/src/core/parser/parse_fline.c +++ b/src/core/parser/parse_fline.c @@ -238,13 +238,13 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) && (fl->u.request.version.s[0]=='S' || fl->u.request.version.s[0]=='s') && !strncasecmp(fl->u.request.version.s+1, - SIP_VERSION+1, SIP_VERSION_LEN-1)) { + &SIP_VERSION[1], SIP_VERSION_LEN-1)) { fl->flags|=FLINE_FLAG_PROTO_SIP; } else if(fl->u.request.version.len >= HTTP_VERSION_LEN && (fl->u.request.version.s[0]=='H' || fl->u.request.version.s[0]=='h') && !strncasecmp(fl->u.request.version.s+1, - HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { + &HTTP_VERSION[1], HTTP_VERSION_LEN-1)) { fl->flags|=FLINE_FLAG_PROTO_HTTP; } }

4 years, 8 months

git:master:6bb1e849: janssonrpcc: use extern not to declare tmb global many times

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6bb1e84907a6c8bdb0c72289bad7b9915c9b3385 URL: https://github.com/kamailio/kamailio/commit/6bb1e84907a6c8bdb0c72289bad7b99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-07T11:54:28+01:00 janssonrpcc: use extern not to declare tmb global many times --- Modified: src/modules/janssonrpcc/janssonrpc_funcs.c Modified: src/modules/janssonrpcc/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/6bb1e84907a6c8bdb0c72289bad7b99… Patch: https://github.com/kamailio/kamailio/commit/6bb1e84907a6c8bdb0c72289bad7b99… --- diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index 3995174722..93e62bd53d 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -31,7 +31,7 @@ #include "janssonrpc_funcs.h" -struct tm_binds tmb; +extern struct tm_binds tmb; int jsonrpc_request(struct sip_msg* _m, char* _conn, diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index ebb64705b5..5e9d01d004 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -51,7 +51,7 @@ #include "janssonrpc_connect.h" #include "netstring.h" -struct tm_binds tmb; +extern struct tm_binds tmb; /* event bases */ struct event_base* global_ev_base = NULL;

4 years, 8 months

git:master:2b070a62: core: remove compiler warnings [-Wstring-plus-int]

by Victor Seva

Module: kamailio Branch: master Commit: 2b070a622fa3c78d929580fda3c7952963c4066b URL: https://github.com/kamailio/kamailio/commit/2b070a622fa3c78d929580fda3c7952… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-07T11:35:55+01:00 core: remove compiler warnings [-Wstring-plus-int] > core/parser/parse_fline.c:93:34: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 && > ~~~~~~~~~~~^~ > > core/parser/parse_fline.c:121:9: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > } else IFISMETHOD( INVITE, 'I' ) > ^~~~~~~~~~~~~~~~~~~~~~~~~ > > core/parser/msg_parser.h:131:35: note: expanded from macro 'IFISMETHOD' > strncasecmp( tmp+1, #methodname +1, methodname##_LEN-1)==0 && \ > ~~~~~~~~~~~~^~ --- Modified: src/core/parser/msg_parser.h Modified: src/core/parser/parse_fline.c --- Diff: https://github.com/kamailio/kamailio/commit/2b070a622fa3c78d929580fda3c7952… Patch: https://github.com/kamailio/kamailio/commit/2b070a622fa3c78d929580fda3c7952… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index f3ea088eb8..ceedf2cda9 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -128,7 +128,7 @@ typedef enum request_method { #define IFISMETHOD(methodname,firstchar) \ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ - strncasecmp( tmp+1, #methodname +1, methodname##_LEN-1)==0 && \ + strncasecmp( tmp+1, &#methodname[1], methodname##_LEN-1)==0 && \ *(tmp+methodname##_LEN)==' ') { \ fl->type=SIP_REQUEST; \ fl->u.request.method.len=methodname##_LEN; \ diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c index c535b49a4c..a5aefb7ee8 100644 --- a/src/core/parser/parse_fline.c +++ b/src/core/parser/parse_fline.c @@ -90,7 +90,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) tmp=buffer; /* is it perhaps a reply, ie does it start with "SIP...." ? */ if ( (*tmp=='S' || *tmp=='s') && - strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 && + strncasecmp( tmp+1, &SIP_VERSION[1], SIP_VERSION_LEN-1)==0 && (*(tmp+SIP_VERSION_LEN)==' ')) { fl->type=SIP_REPLY; fl->flags|=FLINE_FLAG_PROTO_SIP; @@ -98,7 +98,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) tmp=buffer+SIP_VERSION_LEN; } else if (http_reply_parse != 0 && (*tmp=='H' || *tmp=='h')) { /* 'HTTP/1.' */ - if (strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 && + if (strncasecmp( tmp+1, &HTTP_VERSION[1], HTTP_VERSION_LEN-1)==0 && /* [0|1] */ ((*(tmp+HTTP_VERSION_LEN)=='0') || (*(tmp+HTTP_VERSION_LEN)=='1')) && (*(tmp+HTTP_VERSION_LEN+1)==' ') ){ @@ -111,7 +111,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/; tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */; /* 'HTTP/2' */ - } else if (strncasecmp( tmp+1, HTTP2_VERSION+1, HTTP2_VERSION_LEN-1)==0 && + } else if (strncasecmp( tmp+1, &HTTP2_VERSION[1], HTTP2_VERSION_LEN-1)==0 && (*(tmp+HTTP2_VERSION_LEN)==' ')) { fl->type=SIP_REPLY; fl->flags|=FLINE_FLAG_PROTO_HTTP;

4 years, 8 months

Re: [sr-dev] Regarding MIPS Compilation

by subhra giri

Dear Henning Executing "make cfg " gives below output [root@www kamailio-5.3.2]# make cfg make -C src/ cfg target architecture <mips64>, host architecture <x86_64> ---------------------------------------------------------------------------------------------------------------------------------------------------------- In native platform it is compiling successfully. But giving problem for target platform i.e mips64-octeon-linux. Please help me with steps for mips compilation Thanks and Regards Subhra Prakash Giri >

4 years, 8 months

git:master:7c097c1b: pv: remove unnecessary casts that rise warnings with some compilers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7c097c1b3715526611668233be79fdf9b1cb0063 URL: https://github.com/kamailio/kamailio/commit/7c097c1b3715526611668233be79fdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T23:56:42+01:00 pv: remove unnecessary casts that rise warnings with some compilers --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/7c097c1b3715526611668233be79fdf… Patch: https://github.com/kamailio/kamailio/commit/7c097c1b3715526611668233be79fdf… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index ed7c4677fe..36dbcf24b5 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -536,8 +536,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_S_ENCODEBASE64URL: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); - i = base64url_enc((unsigned char *) val->rs.s, val->rs.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_enc(val->rs.s, val->rs.len, + _tr_buffer, TR_BUFFER_SIZE-1); if (i < 0) return -1; _tr_buffer[i] = '\0'; @@ -549,8 +549,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_S_DECODEBASE64URL: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); - i = base64url_dec((unsigned char *) val->rs.s, val->rs.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_dec(val->rs.s, val->rs.len, + _tr_buffer, TR_BUFFER_SIZE-1); if (i < 0 || (i == 0 && val->rs.len > 0)) return -1; _tr_buffer[i] = '\0'; @@ -562,8 +562,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_S_ENCODEBASE64URLT: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); - i = base64url_enc((unsigned char *) val->rs.s, val->rs.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_enc(val->rs.s, val->rs.len, + _tr_buffer, TR_BUFFER_SIZE-1); if (i < 0) return -1; if (i>1 && _tr_buffer[i-1] == '=') { @@ -594,11 +594,11 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, st.len = val->rs.len + (4 - (val->rs.len % 4)); /* move to next buffer */ tr_set_crt_buffer(); - i = base64url_dec((unsigned char *) st.s, st.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_dec(st.s, st.len, + _tr_buffer, TR_BUFFER_SIZE-1); } else { - i = base64url_dec((unsigned char *) val->rs.s, val->rs.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_dec(val->rs.s, val->rs.len, + _tr_buffer, TR_BUFFER_SIZE-1); } if (i < 0 || (i == 0 && val->rs.len > 0)) return -1;

4 years, 8 months

← Newer
1
...
35
36
37
38
39
40
41
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020