sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

git:master:413b6d57: Fix incorrect length of static string
by GitHub 20 Apr '19

20 Apr '19

Module: kamailio Branch: master Commit: 413b6d572683c0d8e7a40f0788d881112b5a1aa2 URL: https://github.com/kamailio/kamailio/commit/413b6d572683c0d8e7a40f0788d8811… Author: Jan Janak <janakj(a)cs.columbia.edu> Committer: GitHub <noreply(a)github.com> Date: 2019-04-19T16:13:44-04:00 Fix incorrect length of static string This change fixes Coverity bug "185775 Out-of-bounds access". --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/413b6d572683c0d8e7a40f0788d8811… Patch: https://github.com/kamailio/kamailio/commit/413b6d572683c0d8e7a40f0788d8811… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 391c7840a0..2dd6d834db 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -991,9 +991,9 @@ int imc_handle_rooms(struct sip_msg* msg, imc_cmd_t *cmd, p = imc_body_buf; left = IMC_BUF_SIZE; - memcpy(p, "Rooms:\n", 9); - p += 9; - left -= 9; + memcpy(p, "Rooms:\n", 7); + p += 7; + left -= 7; for (i = 0; i < imc_hash_size; i++) { lock_get(&_imc_htable[i].lock);

2 1

Kamailio, TLS, and LetsEncrypt
by Gaurav Bmotra 19 Apr '19

19 Apr '19

HI this is Gaurav im using kamailio 5.1.2 on ubuntu 18.4 i am trying to configure LetsEncrypt (tls) for kamailio sing following link https://www.fredposner.com/1836/kamailio-tls-and-letsencrypt/ but unable to start kamailio ,i m getting these error ------->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Apr 19 11:23:57 ubuntufresh systemd[1]: Starting Kamailio (OpenSER) - the Open Source SIP Server... Apr 19 11:23:58 ubuntufresh kamailio[5365]: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Apr 19 11:23:58 ubuntufresh kamailio[5365]: INFO: <core> [core/tcp_main.c:4721]: init_tcp(): using epoll_lt as the io watch method (auto detected) Apr 19 11:23:58 ubuntufresh kamailio[5365]: Listening on Apr 19 11:23:58 ubuntufresh kamailio[5365]: Aliases: Apr 19 11:23:58 ubuntufresh kernel: kamailio[5378]: segfault at 0 ip 00007f8d6fdac646 sp 00007ffe8e2337f8 error 4 in libc-2.27.so [7f8d6fcfb000+1e7000] Apr 19 11:23:58 ubuntufresh kamailio[5365]: ERROR: <core> [core/daemonize.c:303]: daemonize(): Main process exited before writing to pipe Apr 19 11:23:58 ubuntufresh systemd[1]: kamailio.service: Control process exited, code=exited status=255 Apr 19 11:23:58 ubuntufresh systemd[1]: kamailio.service: Failed with result 'exit-code'. Apr 19 11:23:58 ubuntufresh systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<------------------------------------ plz help -- *Regards:* Gaurav Kumar

2 1

git:master:4b1b3502: siptrace: fixed kemi export parameters for sip_trace_dst_cid_type()
by Daniel-Constantin Mierla 19 Apr '19

19 Apr '19

Module: kamailio Branch: master Commit: 4b1b3502c4bae9bf28f6b538b2a180da5bee3ec2 URL: https://github.com/kamailio/kamailio/commit/4b1b3502c4bae9bf28f6b538b2a180d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-19T08:16:04+02:00 siptrace: fixed kemi export parameters for sip_trace_dst_cid_type() --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/4b1b3502c4bae9bf28f6b538b2a180d… Patch: https://github.com/kamailio/kamailio/commit/4b1b3502c4bae9bf28f6b538b2a180d… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index df848c7ad2..c34d25d249 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2214,7 +2214,7 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { }, { str_init("siptrace"), str_init("sip_trace_dst_cid_type"), SR_KEMIP_INT, ki_sip_trace_dst_cid_flag, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siptrace"), str_init("hlog"),

1 0

TLS implementation for kamailio
by Gaurav Bmotra 19 Apr '19

19 Apr '19

HI this is Gaurav im using kamailio 5.1.2 on ubuntu 18.4 i want to implement TLs for kamailio plz help -- *Regards:* Gaurav Kumar

1 0

git:master:5d6f35d8: pkg/kamailio/deb: version set to 5.3.0~dev5
by Victor Seva 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 5d6f35d825cd2d688c3618bd37d11f12634d7c8f URL: https://github.com/kamailio/kamailio/commit/5d6f35d825cd2d688c3618bd37d11f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-18T17:09:25+02:00 pkg/kamailio/deb: version set to 5.3.0~dev5 --- Modified: pkg/kamailio/deb/bionic/changelog 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/5d6f35d825cd2d688c3618bd37d11f1… Patch: https://github.com/kamailio/kamailio/commit/5d6f35d825cd2d688c3618bd37d11f1…

1 0

git:master:25b1f199: tm: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 25b1f199294ae857bf0cdf8c219ee8576fd60f8f URL: https://github.com/kamailio/kamailio/commit/25b1f199294ae857bf0cdf8c219ee85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 tm: removed ifdefs for WITH_XAVP --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/25b1f199294ae857bf0cdf8c219ee85… Patch: https://github.com/kamailio/kamailio/commit/25b1f199294ae857bf0cdf8c219ee85…

1 0

git:master:092f3b53: usrloc: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 092f3b53d6c554eed2de0d2c62093c091a7d1e89 URL: https://github.com/kamailio/kamailio/commit/092f3b53d6c554eed2de0d2c62093c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 usrloc: removed ifdefs for WITH_XAVP --- Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/092f3b53d6c554eed2de0d2c62093c0… Patch: https://github.com/kamailio/kamailio/commit/092f3b53d6c554eed2de0d2c62093c0… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 93b30fab05..fe04d2af3d 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -50,7 +50,6 @@ void ul_set_xavp_contact_clone(int v) ul_xavp_contact_clone = v; } -#ifdef WITH_XAVP /*! * \brief Store xavp list per contact * \param _c contact structure @@ -74,7 +73,6 @@ void ucontact_xavp_store(ucontact_t *_c) _c->xavp = xavp_clone_level_nodata(xavp); return; } -#endif int uldb_delete_attrs_ruid(str* _dname, str *_ruid); @@ -135,9 +133,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->tcpconn_id = _ci->tcpconn_id; c->server_id = _ci->server_id; c->keepalive = (_ci->cflags & nat_bflag)?1:0; -#ifdef WITH_XAVP ucontact_xavp_store(c); -#endif return c; @@ -150,9 +146,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ if (c->c.s) shm_free(c->c.s); if (c->ruid.s) shm_free(c->ruid.s); if (c->instance.s) shm_free(c->instance.s); -#ifdef WITH_XAVP if (c->xavp) xavp_destroy_list(&c->xavp); -#endif shm_free(c); return 0; } @@ -173,9 +167,7 @@ void free_ucontact(ucontact_t* _c) if (_c->c.s) shm_free(_c->c.s); if (_c->ruid.s) shm_free(_c->ruid.s); if (_c->instance.s) shm_free(_c->instance.s); -#ifdef WITH_XAVP if (_c->xavp) xavp_destroy_list(&_c->xavp); -#endif shm_free( _c ); } @@ -286,7 +278,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->received.s = 0; _c->received.len = 0; } - + if (_ci->path) { update_str( &_c->path, _ci->path); } else { @@ -295,9 +287,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->path.len = 0; } -#ifdef WITH_XAVP ucontact_xavp_store(_c); -#endif _c->sock = _ci->sock; _c->expires = _ci->expires; diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index 6fb4965539..fed89d1c70 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -30,9 +30,7 @@ #include "ul_callback.h" #include "../../core/qvalue.h" #include "../../core/str.h" -#ifdef WITH_XAVP #include "../../core/xavp.h" -#endif #define NO_DB 0 #define WRITE_THROUGH 1 @@ -96,9 +94,7 @@ typedef struct ucontact { int server_id; /*!< server id */ int tcpconn_id; /*!< unique tcp connection id */ int keepalive; /*!< keepalive */ -#ifdef WITH_XAVP sr_xavp_t * xavp; /*!< per contact xavps */ -#endif struct ucontact* next; /*!< Next contact in the linked list */ struct ucontact* prev; /*!< Previous contact in the linked list */ } ucontact_t; @@ -124,9 +120,7 @@ typedef struct ucontact_info { int server_id; /*!< server id */ int tcpconn_id; /*!< connection id */ int keepalive; /*!< keepalive */ -#ifdef WITH_XAVP sr_xavp_t * xavp; /*!< per contact xavps */ -#endif time_t last_modified; /*!< last modified */ } ucontact_info_t;

1 0

git:master:e1a6f39a: sqlops: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: e1a6f39a7366d9275f4a2bca1affbf04be459de8 URL: https://github.com/kamailio/kamailio/commit/e1a6f39a7366d9275f4a2bca1affbf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 sqlops: removed ifdefs for WITH_XAVP --- Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sql_api.h Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/e1a6f39a7366d9275f4a2bca1affbf0… Patch: https://github.com/kamailio/kamailio/commit/e1a6f39a7366d9275f4a2bca1affbf0… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index f39da7fed8..54c123f85e 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -31,9 +31,7 @@ #include "../../core/hashes.h" #include "../../core/ut.h" #include "../../lib/srdb1/db_ut.h" -#ifdef WITH_XAVP #include "../../core/xavp.h" -#endif #include "sql_api.h" @@ -461,7 +459,6 @@ int sql_do_query_async(sql_con_t *con, str *query) return 1; } -#ifdef WITH_XAVP int sql_exec_xquery(struct sip_msg *msg, sql_con_t *con, str *query, str *xavp) { @@ -560,6 +557,7 @@ int sql_exec_xquery(struct sip_msg *msg, sql_con_t *con, str *query, return 1; } + int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, pv_elem_t *res) { @@ -583,8 +581,6 @@ int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, return sql_exec_xquery(msg, con, &sv, &xavp); } -#endif - int sql_do_pvquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, pvname_list_t *res) diff --git a/src/modules/sqlops/sql_api.h b/src/modules/sqlops/sql_api.h index 9502de91a6..ec7a55eb8b 100644 --- a/src/modules/sqlops/sql_api.h +++ b/src/modules/sqlops/sql_api.h @@ -72,10 +72,8 @@ int sql_reconnect(sql_con_t *sc); int sql_do_query(sql_con_t *con, str *query, sql_result_t *res); int sql_do_query_async(sql_con_t *con, str *query); -#ifdef WITH_XAVP int sql_do_xquery(sip_msg_t *msg, sql_con_t *con, pv_elem_t *query, pv_elem_t *res); -#endif int sql_do_pvquery(sip_msg_t *msg, sql_con_t *con, pv_elem_t *query, pvname_list_t *res); int pv_get_sqlrows(sip_msg_t *msg, pv_param_t *param, diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 7c248ab887..1b16c06ed7 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -62,9 +62,7 @@ static int sql_check_connection(sql_con_t*); static int sql_query(struct sip_msg*, char*, char*, char*); static int sql_query2(struct sip_msg*, char*, char*); static int sql_query_async(struct sip_msg*, char*, char*); -#ifdef WITH_XAVP static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res); -#endif static int sql_pvquery(struct sip_msg *msg, char *dbl, char *query, char *res); static int sql_rfree(struct sip_msg*, char*, char*); static int mod_init(void); @@ -72,9 +70,7 @@ static int child_init(int rank); static void destroy(void); static int fixup_sql_query(void** param, int param_no); -#ifdef WITH_XAVP static int fixup_sql_xquery(void** param, int param_no); -#endif static int fixup_sql_pvquery(void** param, int param_no); static int fixup_sql_rfree(void** param, int param_no); @@ -100,10 +96,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"sql_query_async", (cmd_function)sql_query_async, 2, fixup_sql_query, 0, ANY_ROUTE}, -#ifdef WITH_XAVP {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, ANY_ROUTE}, -#endif {"sql_pvquery", (cmd_function)sql_pvquery, 3, fixup_sql_pvquery, 0, ANY_ROUTE}, {"sql_result_free", (cmd_function)sql_rfree, 1, fixup_sql_rfree, 0, @@ -276,7 +270,6 @@ static int sql_query_async(struct sip_msg *msg, char *dbl, char *query) } -#ifdef WITH_XAVP /** * */ @@ -288,7 +281,6 @@ static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res) } return sql_do_xquery(msg, (sql_con_t*)dbl, (pv_elem_t*)query, (pv_elem_t*)res); } -#endif /** * @@ -351,7 +343,6 @@ static int fixup_sql_query(void** param, int param_no) return 0; } -#ifdef WITH_XAVP /** * */ @@ -389,7 +380,6 @@ static int fixup_sql_xquery(void** param, int param_no) } return 0; } -#endif /** *

1 0

git:master:7e8b5ea7: pv: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 7e8b5ea7a4068e5432589975b40aea59f85742d9 URL: https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 pv: removed ifdefs for WITH_XAVP --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea5… Patch: https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea5… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c065dca5d2..515321e313 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -40,9 +40,7 @@ #include "pv_time.h" #include "pv_trans.h" #include "pv_select.h" -#ifdef WITH_XAVP #include "pv_xavp.h" -#endif #include "pv_api.h" MODULE_VERSION @@ -92,12 +90,9 @@ static pv_export_t mod_pvs[] = { pv_parse_snd_name, 0, 0, 0 }, { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, 0, pv_parse_rcv_name, 0, 0, 0 }, -#ifdef WITH_XAVP { {"xavp", sizeof("xavp")-1}, /* xavp */ PVT_XAVP, pv_get_xavp, pv_set_xavp, pv_parse_xavp_name, 0, 0, 0 }, -#endif - {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name, @@ -565,14 +560,12 @@ static cmd_export_t cmds[]={ ANY_ROUTE }, {"pv_unset", (cmd_function)pv_unset, 1, fixup_pvar_null, 0, ANY_ROUTE }, -#ifdef WITH_XAVP {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE }, {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE }, {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE }, -#endif {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"typeof", (cmd_function)pv_typeof, 2, fixup_pvar_none, diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index c36a6c6f1f..a627f2ae1b 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) + * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,8 +14,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef WITH_XAVP - #include <stdio.h> #include "../../core/dprint.h" @@ -753,4 +751,3 @@ int pv_xavp_to_var(str *xname) { } while(xavp); return 1; } -#endif diff --git a/src/modules/pv/pv_xavp.h b/src/modules/pv/pv_xavp.h index 90bc9da762..35c410931e 100644 --- a/src/modules/pv/pv_xavp.h +++ b/src/modules/pv/pv_xavp.h @@ -13,12 +13,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - + #ifndef _PV_XAVP_H_ #define _PV_XAVP_H_ -#ifdef WITH_XAVP - #include "../../core/pvar.h" #include "pv_svar.h" @@ -36,4 +34,3 @@ int pv_var_to_xavp(str *varname, str *xname); int pv_xavp_to_var(str *xname); #endif -#endif

1 0

git:master:3d58bdfc: core: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 3d58bdfc699b5fbeac18536604a3cd8217eaef8c URL: https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 core: removed ifdefs for WITH_XAVP - xavps are enabled for about 10 years and used extensively --- Modified: src/core/receive.c Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8… Patch: https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8… --- diff --git a/src/core/receive.c b/src/core/receive.c index dd9248c721..3a2919cec2 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -46,9 +46,7 @@ #include "dset.h" #include "fmsg.h" #include "usr_avp.h" -#ifdef WITH_XAVP #include "xavp.h" -#endif #include "select_buf.h" #include "tcp_server.h" /* for tcpconn_add_alias */ @@ -583,7 +581,5 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) void ksr_msg_env_reset(void) { reset_avps(); -#ifdef WITH_XAVP xavp_reset_list(); -#endif } diff --git a/src/core/xavp.c b/src/core/xavp.c index be3bba423f..f9b0fd627f 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -20,8 +20,6 @@ * Module: \ref core */ -#ifdef WITH_XAVP - #include <stdio.h> #include <string.h> @@ -1041,4 +1039,3 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) } return rlen; } -#endif diff --git a/src/core/xavp.h b/src/core/xavp.h index 4cd333eaaf..4f440ea612 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) + * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -18,8 +18,6 @@ #ifndef _SR_XAVP_H_ #define _SR_XAVP_H_ -#ifdef WITH_XAVP - #include <time.h> #include "str.h" #include "str_list.h" @@ -111,6 +109,5 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen); int xavp_set_child_ival(str *rname, str *cname, int ival); int xavp_set_child_sval(str *rname, str *cname, str *sval); -#endif #endif

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019