sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:5.0:fdb4538e: topos: free empty db results

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: fdb4538e02df824e946afb071aa708f6671586a1 URL: https://github.com/kamailio/kamailio/commit/fdb4538e02df824e946afb071aa708f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T22:19:09+02:00 topos: free empty db results - root structure and column names are allocated and lead to leak - reported by Sergey Basov (cherry picked from commit 3e1b30e5d6020340eaf106b22b7b81ccc33de63d) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fdb4538e02df824e946afb071aa708f… Patch: https://github.com/kamailio/kamailio/commit/fdb4538e02df824e946afb071aa708f… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6817d5f..8145938 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -810,6 +810,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) int nr_keys; int nr_cols; int n; + int ret = 0; if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) return -1; @@ -853,7 +854,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if (RES_ROW_N(db_res) <= 0) { LM_DBG("no stored record for <%.*s>\n", md->x_vbranch1.len, ZSW(md->x_vbranch1.s)); - return 1; + ret = 1; + goto done; } sd->cp = sd->cbuf; @@ -874,10 +876,11 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; +done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) LM_ERR("failed to free result of query\n"); - return 0; + return ret; error: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) @@ -907,6 +910,7 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) int nr_keys; int nr_cols; int n; + int ret = 0; if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) return -1; @@ -983,7 +987,8 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if (RES_ROW_N(db_res) <= 0) { LM_DBG("no stored record for <%.*s>\n", md->a_uuid.len, ZSW(md->a_uuid.s)); - return 1; + ret = 1; + goto done; } sd->cp = sd->cbuf; @@ -1011,10 +1016,11 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; +done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) LM_ERR("failed to free result of query\n"); - return 0; + return ret; error: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0)

7 years, 7 months

git:master:3e1b30e5: topos: free empty db results

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3e1b30e5d6020340eaf106b22b7b81ccc33de63d URL: https://github.com/kamailio/kamailio/commit/3e1b30e5d6020340eaf106b22b7b81c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T22:17:12+02:00 topos: free empty db results - root structure and column names are allocated and lead to leak - reported by Sergey Basov --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/3e1b30e5d6020340eaf106b22b7b81c… Patch: https://github.com/kamailio/kamailio/commit/3e1b30e5d6020340eaf106b22b7b81c… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6817d5f..8145938 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -810,6 +810,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) int nr_keys; int nr_cols; int n; + int ret = 0; if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) return -1; @@ -853,7 +854,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if (RES_ROW_N(db_res) <= 0) { LM_DBG("no stored record for <%.*s>\n", md->x_vbranch1.len, ZSW(md->x_vbranch1.s)); - return 1; + ret = 1; + goto done; } sd->cp = sd->cbuf; @@ -874,10 +876,11 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; +done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) LM_ERR("failed to free result of query\n"); - return 0; + return ret; error: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) @@ -907,6 +910,7 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) int nr_keys; int nr_cols; int n; + int ret = 0; if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) return -1; @@ -983,7 +987,8 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if (RES_ROW_N(db_res) <= 0) { LM_DBG("no stored record for <%.*s>\n", md->a_uuid.len, ZSW(md->a_uuid.s)); - return 1; + ret = 1; + goto done; } sd->cp = sd->cbuf; @@ -1011,10 +1016,11 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; +done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) LM_ERR("failed to free result of query\n"); - return 0; + return ret; error: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0)

7 years, 7 months

git:master:873f3176: .gitignore: more types of tag files added to ignored list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 873f3176b228e91e5c2149d75a7329a6174c48e5 URL: https://github.com/kamailio/kamailio/commit/873f3176b228e91e5c2149d75a7329a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T21:46:23+02:00 .gitignore: more types of tag files added to ignored list --- Modified: .gitignore --- Diff: https://github.com/kamailio/kamailio/commit/873f3176b228e91e5c2149d75a7329a… Patch: https://github.com/kamailio/kamailio/commit/873f3176b228e91e5c2149d75a7329a… --- diff --git a/.gitignore b/.gitignore index d843f40..900851f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ modules.lst # tags tags TAGS +.tags* # vi swaps .*.swp .*.swo

7 years, 7 months

git:master:a8b7f94a: dialog: more safety checks to detect if dialog is gone after event route execution

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8b7f94a5c305e14313d5528792f9ca6518d5969 URL: https://github.com/kamailio/kamailio/commit/a8b7f94a5c305e14313d5528792f9ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T21:39:22+02:00 dialog: more safety checks to detect if dialog is gone after event route execution - avoid execution of script callbacks for event route - related to GH #1059 and #1069 --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_profile.c Modified: src/modules/dialog/dlg_var.c Modified: src/modules/ims_dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/a8b7f94a5c305e14313d5528792f9ca… Patch: https://github.com/kamailio/kamailio/commit/a8b7f94a5c305e14313d5528792f9ca…

7 years, 7 months

git:master:7004969c: dialog: execute pre script callback only when event route is set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7004969cf94815167d72d2e7158e4754c730ff1d URL: https://github.com/kamailio/kamailio/commit/7004969cf94815167d72d2e7158e475… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T19:59:38+02:00 dialog: execute pre script callback only when event route is set --- Modified: src/core/script_cb.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/7004969cf94815167d72d2e7158e475… Patch: https://github.com/kamailio/kamailio/commit/7004969cf94815167d72d2e7158e475… --- diff --git a/src/core/script_cb.c b/src/core/script_cb.c index 5e1547e..efd76cf 100644 --- a/src/core/script_cb.c +++ b/src/core/script_cb.c @@ -18,15 +18,15 @@ * 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 * */ /*! * \file - * \brief Kamailio core :: Script callbacks + * \brief Kamailio core :: Script callbacks * * Script callbacks adds the ability to register callback * functions which are always called when script for request @@ -151,12 +151,11 @@ int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) struct script_cb *cb; unsigned int flags; -#ifdef EXTRA_DEBUG if (type > SCRIPT_CB_NUM) { - LOG(L_BUG, "Uknown callback type\n"); - abort(); + LOG(L_BUG, "Uknown callback type %d\n", type); + return 0; } -#endif + flags = PRE_SCRIPT_CB | (1<<(type-1)); for (cb=pre_script_cb[type-1]; cb ; cb=cb->next ) { /* stop on error */ @@ -174,12 +173,11 @@ int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) struct script_cb *cb; unsigned int flags; -#ifdef EXTRA_DEBUG if (type > SCRIPT_CB_NUM) { - LOG(L_BUG, "exec_pre_script_cb: Uknown callback type\n"); - abort(); + LOG(L_BUG, "Uknown callback type %d\n", type); + return 1; } -#endif + flags = POST_SCRIPT_CB | (1<<(type-1)); for (cb=post_script_cb[type-1]; cb ; cb=cb->next){ cb->cbf(msg, flags, cb->param); diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 2eb36f5..030847b 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -61,7 +61,7 @@ static str rr_param; /*!< record-route parameter for matching */ static int dlg_flag_mask=0; /*!< flag for dialog tracking */ static pv_spec_t *timeout_avp; /*!< AVP for timeout setting */ static int default_timeout; /*!< default dialog timeout */ -static int seq_match_mode; /*!< dlg_match mode */ +static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ extern int detect_spirals; extern int dlg_timeout_noreset; @@ -171,7 +171,7 @@ static inline int add_dlg_rr_param(struct sip_msg *req, unsigned int entry, /*! * \brief Parse SIP message and populate leg informations * - * Parse SIP message and populate leg informations. + * Parse SIP message and populate leg informations. * \param dlg the dialog to add cseq, contact & record_route * \param msg sip message * \param t transaction @@ -813,7 +813,7 @@ static void unref_new_dialog(void *iuid) * \param t transaction * \param run_initial_cbs if set zero, initial callbacks are not executed * \return 0 on success, -1 on failure - */ + */ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) { dlg_cell_t *dlg; @@ -1191,7 +1191,7 @@ dlg_cell_t *dlg_lookup_msg_dialog(sip_msg_t *msg, unsigned int *dir) } return dlg; } - + if (pre_match_parse(msg, &callid, &ftag, &ttag, 0)<0) return NULL; vdir = DLG_DIR_NONE; @@ -1723,16 +1723,15 @@ void dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate } } + if(rt>=0 || dlg_event_callback.len>0) { + if(msg==NULL) + fmsg = faked_msg_next(); + else + fmsg = msg; - if(msg==NULL) - fmsg = faked_msg_next(); - else - fmsg = msg; - - if (exec_pre_script_cb(fmsg, LOCAL_CB_TYPE)<=0) - return; + if (exec_pre_script_cb(fmsg, LOCAL_CB_TYPE)<=0) + return; - if(rt>=0 || dlg_event_callback.len>0) { dlg_ref(dlg, 1); dlg_set_ctx_iuid(dlg); LM_DBG("executing event_route %d on state %d\n", rt, nstate);

7 years, 7 months

Testing parse_uri()

by James Cloos

The file misc/code/p_uri.c looks intended to facilitate tests of parse_uri(), but it does not compile anymore. has anyone massaged the code to allow ax external compilation of the parse_uri() funciton? The tree of dependencies is dense. -JimC -- James Cloos <cloos(a)jhcloos.com> OpenPGP: 0x997A9F17ED7DAEA6

7 years, 7 months

[kamailio/kamailio] Segmentation fault using http_async_client on kamailio 5.0.0 (#1056)

by Davy Van De Moere

### Description I'm using a few serial http_async_client functions in my config, I found one setup in which kamailio stops with a segmentation fault just doing one call. I can reproduce it in my concrete config, but can't put my finger on the bleeding. I do have a core file. ### Troubleshooting #### Reproduction gdb kamailio core 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 kamailio...done. [New LWP 8187] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `kamailio -f /etc/kamailio/kamailio.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f85580c360a in t_continue () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tm.so (gdb) bt full #0 0x00007f85580c360a in t_continue () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tm.so No symbol table info available. #1 0x00007f8555ed3848 in async_http_cb () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so No symbol table info available. #2 0x00007f8555ecda72 in check_multi_info () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so No symbol table info available. #3 0x00007f8555ec56a4 in event_cb () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so No symbol table info available. #4 0x00007f8555a043dc in event_base_loop () from /usr/lib/x86_64-linux-gnu/libevent-2.0.so.5 No symbol table info available. #5 0x00007f8555ed0c3d in async_http_run_worker () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so No symbol table info available. #6 0x00007f8555eba86e in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so No symbol table info available. #7 0x00000000004f204c in init_mod_child (m=0x7f855a6195c8, rank=0) at core/sr_module.c:921 __FUNCTION__ = "init_mod_child" #8 0x00000000004f1d6a in init_mod_child (m=0x7f855a61a1e0, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #9 0x00000000004f1d6a in init_mod_child (m=0x7f855a61a850, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #10 0x00000000004f1d6a in init_mod_child (m=0x7f855a61adb0, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #11 0x00000000004f1d6a in init_mod_child (m=0x7f855a61b420, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #12 0x00000000004f1d6a in init_mod_child (m=0x7f855a61b8d0, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #13 0x00000000004f1d6a in init_mod_child (m=0x7f855a61bfe8, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #14 0x00000000004f1d6a in init_mod_child (m=0x7f855a61c440, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #15 0x00000000004f1d6a in init_mod_child (m=0x7f855a61c7e8, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #16 0x00000000004f1d6a in init_mod_child (m=0x7f855a61cb88, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #17 0x00000000004f1d6a in init_mod_child (m=0x7f855a61cfc8, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #18 0x00000000004f1d6a in init_mod_child (m=0x7f855a61d370, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #19 0x00000000004f1d6a in init_mod_child (m=0x7f855a61d780, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #20 0x00000000004f1d6a in init_mod_child (m=0x7f855a61dbc8, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #21 0x00000000004f1d6a in init_mod_child (m=0x7f855a61e380, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" ---Type <return> to continue, or q <return> to quit--- #22 0x00000000004f1d6a in init_mod_child (m=0x7f855a61ec00, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #23 0x00000000004f1d6a in init_mod_child (m=0x7f855a621608, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #24 0x00000000004f1d6a in init_mod_child (m=0x7f855a622290, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #25 0x00000000004f1d6a in init_mod_child (m=0x7f855a622660, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #26 0x00000000004f1d6a in init_mod_child (m=0x7f855a62c5d0, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #27 0x00000000004f1d6a in init_mod_child (m=0x7f855a62dae0, rank=0) at core/sr_module.c:918 __FUNCTION__ = "init_mod_child" #28 0x00000000004f237a in init_child (rank=0) at core/sr_module.c:947 No locals. #29 0x00000000004231bb in main_loop () at main.c:1700 i = 4 pid = 8165 si = 0x0 si_desc = "udp receiver child=3 sock=185.165.211.54:5063\000\000\000OX\350T\205\177\000\000\000Y\350T\205\177\000\000\260\031B\201\000\000\000\000\000\000\000\000\000\000\350\000\000\000t\000\000\000\000\000\030\"}Z\205\177\000\000\000\000\000\000\000\000\000\000\001\000\000\000\002\000\000\000\002\000\000\000\374\177\000\000\277\201e\000\000\000\000" nrprocs = 4 woneinit = 1 __FUNCTION__ = "main_loop" #30 0x0000000000429a61 in main (argc=3, argv=0x7ffc81421d18) at main.c:2639 cfg_stream = 0xf55010 c = -1 r = 0 tmp = 0x7f855b58173d <_dl_lookup_symbol_x+349> "\203\370" tmp_len = 0 port = 1 proto = 32645 options = 0x72b1b0 ":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 = 1992621074 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffc81421bd0 p = 0x7ffc81421d38 "0>B\201\374\177" st = {st_dev = 47, st_ino = 29, st_nlink = 2, st_mode = 16877, st_uid = 104, st_gid = 110, __pad0 = 0, st_rdev = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1488206724, tv_nsec = 372702711}, st_mtim = {tv_sec = 1491326162, tv_nsec = 837249928}, st_ctim = {tv_sec = 1491326162, tv_nsec = 837249928}, __glibc_reserved = {0, 0, 0}} __FUNCTION__ = "main" (gdb) info locals No symbol table info available. (gdb) list 1838 int proto; 1839 char *options; 1840 int ret; 1841 unsigned int seed; 1842 int rfd; 1843 int debug_save, debug_flag; 1844 int dont_fork_cnt; 1845 struct name_lst* n_lst; 1846 char *p; 1847 struct stat st = {0}; ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic ``` (paste your sip traffic here) ``` ### Possible Solutions ### Additional Information kamailio 5.0.0 (x86_64/linux) * **Operating System**: debian on proxmox 4.4.35-1-pve -- 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/1056

7 years, 7 months

[kamailio/kamailio] ipops compiler warnings (#1074)

by juha-h

These warnings should be eliminated in order to make compilation readable: CC (gcc) [M ipops.so] ip_parser.o ip_parser.c:18:18: warning: 'ip_parser_en_main' defined but not used [-Wunused-const-variable=] static const int ip_parser_start = 1; ^~~~~~~~~~~~~~~~~ ip_parser.c:16:18: warning: 'ip_parser_error' defined but not used [-Wunused-const-variable=] ^ ip_parser.c:15:18: warning: 'ip_parser_first_final' defined but not used [-Wunused-const-variable=] /** Data **/ ^ CC (gcc) [M ipops.so] rfc1918_parser.o rfc1918_parser.c:19:18: warning: 'rfc1918_parser_en_main' defined but not used [-Wunused-const-variable=] static const int rfc1918_parser_en_main = 1; ^~~~~~~~~~~~~~~~~~~~~~ rfc1918_parser.c:17:18: warning: 'rfc1918_parser_error' defined but not used [-Wunused-const-variable=] static const int rfc1918_parser_error = 0; ^~~~~~~~~~~~~~~~~~~~ rfc1918_parser.c:16:18: warning: 'rfc1918_parser_first_final' defined but not used [-Wunused-const-variable=] static const int rfc1918_parser_first_final = 28; ^~~~~~~~~~~~~~~~~~~~~~~~~~ -- 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/1074

7 years, 7 months

git:master:1f46fbcd: ipops: removed unused variables from ragel generated files

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1f46fbcdcbfbae80000d3abcf191424d98104f4e URL: https://github.com/kamailio/kamailio/commit/1f46fbcdcbfbae80000d3abcf191424… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T19:04:26+02:00 ipops: removed unused variables from ragel generated files - GH #1074 --- Modified: src/modules/ipops/ip_parser.c Modified: src/modules/ipops/rfc1918_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/1f46fbcdcbfbae80000d3abcf191424… Patch: https://github.com/kamailio/kamailio/commit/1f46fbcdcbfbae80000d3abcf191424… --- diff --git a/src/modules/ipops/ip_parser.c b/src/modules/ipops/ip_parser.c index b9e0a1c..25aea17 100644 --- a/src/modules/ipops/ip_parser.c +++ b/src/modules/ipops/ip_parser.c @@ -1,7 +1,3 @@ -/* - * Warning: This file is auto generated from a ragel syntax (ip_parser.rl), - * do not change it! - */ #line 1 "ip_parser.rl" #include "ip_parser.h" @@ -16,11 +12,6 @@ #line 14 "ip_parser.c" static const int ip_parser_start = 1; -static const int ip_parser_first_final = 237; -static const int ip_parser_error = 0; - -static const int ip_parser_en_main = 1; - #line 45 "ip_parser.rl" diff --git a/src/modules/ipops/rfc1918_parser.c b/src/modules/ipops/rfc1918_parser.c index f39fff0..5542794 100644 --- a/src/modules/ipops/rfc1918_parser.c +++ b/src/modules/ipops/rfc1918_parser.c @@ -13,11 +13,6 @@ #line 15 "rfc1918_parser.c" static const int rfc1918_parser_start = 1; -static const int rfc1918_parser_first_final = 28; -static const int rfc1918_parser_error = 0; - -static const int rfc1918_parser_en_main = 1; - #line 26 "rfc1918_parser.rl"

7 years, 7 months

git:5.0:ebc29b28: db_oracle: fix raw sql queries

by Ovidiu Sas

Module: kamailio Branch: 5.0 Commit: ebc29b28d187527389349c1b1d9d69dcb97d66d0 URL: https://github.com/kamailio/kamailio/commit/ebc29b28d187527389349c1b1d9d69d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-04-21T12:35:20-04:00 db_oracle: fix raw sql queries (cherry picked from commit 5d75450e2a05a029d51ab38c3ef6f36fef49a51b) --- Modified: src/modules/db_oracle/dbase.c Modified: src/modules/db_oracle/res.c --- Diff: https://github.com/kamailio/kamailio/commit/ebc29b28d187527389349c1b1d9d69d… Patch: https://github.com/kamailio/kamailio/commit/ebc29b28d187527389349c1b1d9d69d… --- diff --git a/src/modules/db_oracle/dbase.c b/src/modules/db_oracle/dbase.c index eb400df..a4d54b9 100644 --- a/src/modules/db_oracle/dbase.c +++ b/src/modules/db_oracle/dbase.c @@ -216,7 +216,7 @@ static int db_oracle_submit_query(const db1_con_t* _h, const str* _s) (unsigned)hc); return -1; } - + if (!pqd->_rs) { /* * This method is at ~25% faster as set OCI_COMMIT_ON_SUCCESS @@ -373,8 +373,7 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) int len; const char *p; - if (!_h || !_s || !_s->s) { -badparam: + if (!_h || !_r || !_s || !_s->s) { LM_ERR("invalid parameter value\n"); return -1; } @@ -387,7 +386,6 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) while (len && *p == ' ') ++p, --len; #define _S_DIFF(p, l, S) (l <= sizeof(S)-1 || strncasecmp(p, S, sizeof(S)-1)) if (!_S_DIFF(p, len, "select ")) { - if (!_r) goto badparam; cb._rs = &reshp; } else { if ( _S_DIFF(p, len, "insert ") @@ -398,10 +396,11 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) return -2; } #undef _S_DIFF - if (_r) goto badparam; cb._rs = NULL; } + CON_ORA(_h)->pqdata = &cb; + CON_ORA(_h)->bindpos = 0; len = db_do_raw_query(_h, _s, _r, db_oracle_submit_query, db_oracle_store_result); CON_ORA(_h)->pqdata = NULL; /* paranoid for next call */ return len; @@ -488,7 +487,7 @@ int db_oracle_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, { query_data_t cb; int rc; - + if (!_h || !CON_TABLE(_h)) { LM_ERR("invalid parameter value\n"); return -1; diff --git a/src/modules/db_oracle/res.c b/src/modules/db_oracle/res.c index 5511567..ca585fe 100644 --- a/src/modules/db_oracle/res.c +++ b/src/modules/db_oracle/res.c @@ -440,7 +440,6 @@ int db_oracle_store_result(const db1_con_t* _h, db1_res_t** _r) OCIStmt* hs; if (!_h || !_r) { -badparam: LM_ERR("invalid parameter\n"); return -1; } @@ -448,15 +447,20 @@ int db_oracle_store_result(const db1_con_t* _h, db1_res_t** _r) con = CON_ORA(_h); { query_data_t *pcb = con->pqdata; - - if (!pcb || !pcb->_rs) - goto badparam; - + if (!pcb) { + LM_ERR("invalid parameter\n"); + return -1; + } + if (!pcb->_rs) { + LM_DBG("no result\n"); + return 0; + } + hs = *pcb->_rs; pcb->_rs = NULL; /* paranoid for next call */ - } - + } + rc = -1; if (_r) *_r = NULL; /* unification for all errors */

7 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017