sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:5.1:e2aa0e44: tm: t_serial - safety checks for xavp search result

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: e2aa0e44b3e8d283b6be87c8858e384b40fe63db URL: https://github.com/kamailio/kamailio/commit/e2aa0e44b3e8d283b6be87c8858e384… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:30:37+02:00 tm: t_serial - safety checks for xavp search result (cherry picked from commit 67d5aac30d7e44f0d19e41df88fce39f67192483) --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/e2aa0e44b3e8d283b6be87c8858e384… Patch: https://github.com/kamailio/kamailio/commit/e2aa0e44b3e8d283b6be87c8858e384… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 019b35dbb4..8f8ee0646d 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -642,7 +642,11 @@ int ki_t_next_contacts(struct sip_msg* msg) } vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + if (vavp != NULL) { + flags = vavp->val.v.i; + } else { + flags = 0; + } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); if (vavp != NULL) { @@ -774,8 +778,7 @@ int ki_t_next_contact_flow(struct sip_msg* msg) /* Load Request-URI and branches */ t_get_this_branch_instance(msg, &this_instance); - if (this_instance.len == 0) - { + if (this_instance.len == 0) { LM_DBG("No instance on this branch\n"); return -2; } @@ -792,13 +795,10 @@ int ki_t_next_contact_flow(struct sip_msg* msg) next_xavp = xavp_get_next(xavp); vavp = xavp_get(&instance_name, xavp->val.v.xavp); - if (vavp == NULL) - { + if (vavp == NULL) { /* Does not match this instance */ goto next_xavp; - } - else - { + } else { instance = vavp->val.v.s; if ((instance.len != this_instance.len) || (strncmp(instance.s, this_instance.s, instance.len) != 0)) @@ -807,7 +807,11 @@ int ki_t_next_contact_flow(struct sip_msg* msg) } vavp = xavp_get(&uri_name, xavp->val.v.xavp); - uri = vavp->val.v.s; + if (vavp == NULL) { + goto next_xavp; + } else { + uri = vavp->val.v.s; + } vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); if (vavp != NULL) { @@ -842,13 +846,27 @@ int ki_t_next_contact_flow(struct sip_msg* msg) } vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + if (vavp != NULL) { + flags = vavp->val.v.i; + } else { + flags = 0; + } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); - ruid = vavp->val.v.s; + if (vavp != NULL) { + ruid = vavp->val.v.s; + } else { + ruid.s = ""; + ruid.len = 0; + } vavp = xavp_get(&ua_name, xavp->val.v.xavp); - location_ua = vavp->val.v.s; + if (vavp != NULL) { + location_ua = vavp->val.v.s; + } else { + location_ua.s = ""; + location_ua.len = 0; + } LM_DBG("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s'" " inst-'%.*s' ruid-'%.*s' location_ua-'%.*s'\n",

6 years, 6 months

git:5.1:0b975501: log_custom: check return code for udp send

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 0b9755011687685467e2d53cb4dcb0c58ea28688 URL: https://github.com/kamailio/kamailio/commit/0b9755011687685467e2d53cb4dcb0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:30:22+02:00 log_custom: check return code for udp send (cherry picked from commit 5f91017c0393faa02201ccc3693fee6381ea691a) --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0b9755011687685467e2d53cb4dcb0c… Patch: https://github.com/kamailio/kamailio/commit/0b9755011687685467e2d53cb4dcb0c… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index f88a783b7c..e635baf75e 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -148,7 +148,9 @@ void _lc_core_log_udp(int lpriority, const char *format, ...) n += snprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, "(%d) ", my_pid()); n += vsnprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, format, arglist); va_end(arglist); - udp_send(&_lc_udp_dst, obuf, n); + if(udp_send(&_lc_udp_dst, obuf, n)!=0) { + LM_DBG("udp send returned non zero\n"); + } } int ki_log_udp(sip_msg_t *msg, str *txt)

6 years, 6 months

git:5.1:6bf6cfbb: core: raw sock - reset the rcv_msg and proper test for totlen

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 6bf6cfbb90c3fd29cb0c5c079b0eef44892690bf URL: https://github.com/kamailio/kamailio/commit/6bf6cfbb90c3fd29cb0c5c079b0eef4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:29:56+02:00 core: raw sock - reset the rcv_msg and proper test for totlen (cherry picked from commit 145e3a1e461dd53fb1e06bae619d20a09dcffe75) --- Modified: src/core/raw_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/6bf6cfbb90c3fd29cb0c5c079b0eef4… Patch: https://github.com/kamailio/kamailio/commit/6bf6cfbb90c3fd29cb0c5c079b0eef4… --- diff --git a/src/core/raw_sock.c b/src/core/raw_sock.c index a8beb6691e..9dd65d2340 100644 --- a/src/core/raw_sock.c +++ b/src/core/raw_sock.c @@ -228,6 +228,7 @@ int recvpkt4(int sock, char* buf, int len, union sockaddr_union* from, iov[0].iov_base=buf; iov[0].iov_len=len; + memset(&rcv_msg, 0, sizeof(struct msghdr)); rcv_msg.msg_name=from; rcv_msg.msg_namelen=sockaddru_len(*from); rcv_msg.msg_control=msg_ctrl_buf; @@ -603,7 +604,7 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, int ret; totlen = len + sizeof(hdr); - if (unlikely(totlen) > 65535) + if (unlikely(totlen > 65535)) return -2; memset(&snd_msg, 0, sizeof(snd_msg)); snd_msg.msg_name=&to->sin;

6 years, 6 months

git:5.1:4169c9ab: dialog: docs - fixed example for rpc dlg.terminate_dlg

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 4169c9ab6c4f0636a0a5dcdf77b1a032a7d9d5f6 URL: https://github.com/kamailio/kamailio/commit/4169c9ab6c4f0636a0a5dcdf77b1a03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:29:30+02:00 dialog: docs - fixed example for rpc dlg.terminate_dlg (cherry picked from commit a10d04ddca3a357e8e589a4c3eaba7989dce7de9) --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4169c9ab6c4f0636a0a5dcdf77b1a03… Patch: https://github.com/kamailio/kamailio/commit/4169c9ab6c4f0636a0a5dcdf77b1a03… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 07287abc4a..2a63adf863 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2354,7 +2354,7 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { <emphasis>from_tag</emphasis> - from tag of the dialog to terminated </para></listitem> <listitem><para> - <emphasis>totag</emphasis> - to tag of the dialog to terminated + <emphasis>to_tag</emphasis> - to tag of the dialog to terminated </para></listitem> </itemizedlist> <para> @@ -2362,7 +2362,7 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { </para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - kamcmd dlg.dlg_terminate_dlg callid12345 fromtag123 totag123 + kamcmd dlg.terminate_dlg callid12345 fromtag123 totag123 </programlisting> </section> <section>

6 years, 6 months

git:5.1:9459e4ae: sqlops: increased the length of printed query part in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 9459e4ae1d9599b04ca67f88191cc9a73106965b URL: https://github.com/kamailio/kamailio/commit/9459e4ae1d9599b04ca67f88191cc9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:29:10+02:00 sqlops: increased the length of printed query part in case of errors (cherry picked from commit 5f7eee55c648cfa1b5b5662648fc9133daa6d6b6) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9459e4ae1d9599b04ca67f88191cc9a… Patch: https://github.com/kamailio/kamailio/commit/9459e4ae1d9599b04ca67f88191cc9a… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 16492300bc..0e239fb339 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -262,7 +262,7 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) if(con->dbf.raw_query(con->dbh, query, &db_res)!=0) { LM_ERR("cannot do the query [%.*s]\n", - (query->len>32)?32:query->len, query->s); + (query->len>64)?64:query->len, query->s); return -1; }

6 years, 6 months

git:5.1:a0268561: src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: a026856140a66d9edf4f81c133431d93c2e3392e URL: https://github.com/kamailio/kamailio/commit/a026856140a66d9edf4f81c133431d9… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:28:19+02:00 src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again (cherry picked from commit 7585a57037f6ef21cda376b16b0077fa981eceac) --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a026856140a66d9edf4f81c133431d9… Patch: https://github.com/kamailio/kamailio/commit/a026856140a66d9edf4f81c133431d9… --- diff --git a/src/Makefile b/src/Makefile index d0faa5d473..5b67d7ad67 100644 --- a/src/Makefile +++ b/src/Makefile @@ -348,7 +348,7 @@ modules-cfg modules-list modules-lst: rm -f modules.lst $(MAKE) modules.lst -ifneq ($(wildcard .git),) +ifneq ($(wildcard ../.git),) # if .git/ exists repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ [ -n "$$RV" ] && \ @@ -358,7 +358,7 @@ repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ RV="$$RV"-dirty; echo "$$RV") repo_hash=$(subst -dirty,,$(repo_ver)) repo_state=$(subst %-dirty,dirty,$(findstring -dirty,$(repo_ver))) -autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) core/cfg.y core/cfg.lex Makefile +autover_h_dep=../.git $(filter-out $(auto_gen), $(sources)) core/cfg.y core/cfg.lex Makefile else # else if .git/ does not exist repo_ver=

6 years, 6 months

git:5.1:8aebe3b9: tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 8aebe3b9009cc682ed1d1fefb599bef190b47a09 URL: https://github.com/kamailio/kamailio/commit/8aebe3b9009cc682ed1d1fefb599bef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:27:32+02:00 tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers (cherry picked from commit 72f5eaeeef0239ebd16a2d645b83e83eb1a2b506) --- Modified: src/modules/tm/t_funcs.h Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/8aebe3b9009cc682ed1d1fefb599bef… Patch: https://github.com/kamailio/kamailio/commit/8aebe3b9009cc682ed1d1fefb599bef… --- diff --git a/src/modules/tm/t_funcs.h b/src/modules/tm/t_funcs.h index bbab42482f..5c219ca02f 100644 --- a/src/modules/tm/t_funcs.h +++ b/src/modules/tm/t_funcs.h @@ -96,13 +96,18 @@ int send_pr_buffer( struct retr_buf *rb, void *buf, int len); #ifdef TM_DEL_UNREF -#define UNREF_FREE(_T_cell) \ +#define UNREF_FREE(_T_cell, _T_unlinked) \ do{\ if (atomic_dec_and_test(&(_T_cell)->ref_count)){ \ unlink_timers((_T_cell)); \ free_cell((_T_cell)); \ - }else \ - t_stats_delayed_free(); \ + }else{ \ + if(_T_unlinked){ \ + free_cell((_T_cell)); \ + }else{ \ + t_stats_delayed_free(); \ + } \ + } \ }while(0) #define UNREF_NOSTATS(_T_cell) \ diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 996efbc21c..b5e4325929 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -648,7 +648,11 @@ ticks_t wait_handler(ticks_t ti, struct timer_ln *wait_tl, void *data) remove_from_hash_table_unsafe(p_cell); UNLOCK_HASH(p_cell->hash_index); p_cell->flags |= T_IN_AGONY; - UNREF_FREE(p_cell); + if(t_linked_timers(p_cell)) { + UNREF_FREE(p_cell, 0); + } else { + UNREF_FREE(p_cell, 1); + } ret = 0; #else /* TM_DEL_UNREF */ if(p_cell->flags & T_IN_AGONY) { diff --git a/src/modules/tm/timer.h b/src/modules/tm/timer.h index 3bdb16a65a..5cb6c736a6 100644 --- a/src/modules/tm/timer.h +++ b/src/modules/tm/timer.h @@ -375,5 +375,24 @@ inline static void unlink_timers(struct cell *t) cleanup_localcancel_timers(t); } +inline static int t_linked_timers(tm_cell_t *t) +{ + int i; + + if(t->uas.response.timer.next!=NULL || t->uas.response.timer.prev!=NULL) { + return 1; + } + for(i = 0; i < t->nr_of_outgoings; i++) { + if(t->uac[i].request.timer.next!=NULL + || t->uac[i].request.timer.prev!=NULL) { + return 1; + } + if(t->uac[i].local_cancel.timer.next!=NULL + || t->uac[i].local_cancel.timer.prev!=NULL) { + return 1; + } + } + return 0; +} #endif diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 9b2f51b5f6..42e25762d2 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -589,7 +589,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, if(atomic_get_int(&new_cell->ref_count)==0) { free_cell(new_cell); } else { - UNREF_FREE(new_cell); + UNREF_FREE(new_cell, 0); } } #else

6 years, 6 months

git:5.1:155b7871: tm: backup and restore T and T_branch in t_continue()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 155b78716101fc0c288fe0473c60e5fbb57838f1 URL: https://github.com/kamailio/kamailio/commit/155b78716101fc0c288fe0473c60e5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:27:18+02:00 tm: backup and restore T and T_branch in t_continue() - it may be required to cleanup old T states after t_continue() is finished (cherry picked from commit 5fe2a1a1c67b550431dcae3c98701073f7edd953) --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/155b78716101fc0c288fe0473c60e5f… Patch: https://github.com/kamailio/kamailio/commit/155b78716101fc0c288fe0473c60e5f… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index a150829699..205c945d4c 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -166,7 +166,9 @@ int t_suspend(struct sip_msg *msg, int t_continue_helper(unsigned int hash_index, unsigned int label, struct action *rtact, str *cbname, str *cbparam) { - struct cell *t; + tm_cell_t *t; + tm_cell_t *backup_T = T_UNDEFINED; + int backup_T_branch = T_BR_UNDEFINED; sip_msg_t *faked_req; sip_msg_t *brpl; void *erpl; @@ -187,13 +189,18 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, cfg_update(); + backup_T = get_t(); + backup_T_branch = get_t_branch(); + if (t_lookup_ident(&t, hash_index, label) < 0) { + set_t(backup_T, backup_T_branch); LM_ERR("transaction not found\n"); return -1; } if (!(t->flags & T_ASYNC_SUSPENDED)) { LM_WARN("transaction is not suspended [%u:%u]\n", hash_index, label); + set_t(backup_T, backup_T_branch); return -2; } @@ -203,7 +210,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, * needless to continue */ UNREF(t); /* t_unref would kill the transaction */ /* reset T as we have no working T anymore */ - set_t(T_UNDEFINED, T_BR_UNDEFINED); + set_t(backup_T, backup_T_branch); return 1; } @@ -248,6 +255,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, t->flags &= ~T_ASYNC_CONTINUE; UNLOCK_ASYNC_CONTINUE(t); UNREF(t); /* t_unref would kill the transaction */ + set_t(backup_T, backup_T_branch); return 1; } @@ -387,7 +395,6 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, if(keng->froute(t->uac[branch].reply, TM_ONREPLY_ROUTE, cbname, &evname)<0) { LM_ERR("error running event route kemi callback\n"); - return -1; } } else { LM_DBG("event callback (%.*s) set, but no cfg engine\n", @@ -539,7 +546,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, sip_msg_free(brpl); } - + set_t(backup_T, backup_T_branch); return 0; kill_trans: @@ -566,6 +573,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, /* response handling */ t_unref(t->uac[branch].reply); } + set_t(backup_T, backup_T_branch); return ret; }

6 years, 6 months

git:5.1:75f19a66: topos: docs - added section ids to parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 75f19a666dde2e6264ef12c7a4d9f40fcb0f739b URL: https://github.com/kamailio/kamailio/commit/75f19a666dde2e6264ef12c7a4d9f40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:26:37+02:00 topos: docs - added section ids to parameters (cherry picked from commit 7e5e5ca4ccf21e2644ed8e82bc5225f4432b1247) --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/75f19a666dde2e6264ef12c7a4d9f40… Patch: https://github.com/kamailio/kamailio/commit/75f19a666dde2e6264ef12c7a4d9f40… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index 1732b77724..bb3c44c9c5 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -66,7 +66,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="topoh.p.mask_key"> <title><varname>mask_key</varname> (str)</title> <para> Keyword to mask the headers. @@ -85,7 +85,7 @@ modparam("topoh", "mask_key", "some secret here") </programlisting> </example> </section> - <section> + <section id="topoh.p.mask_ip"> <title><varname>mask_ip</varname> (str)</title> <para> IP address to be used in masked headers to build valid @@ -108,7 +108,7 @@ modparam("topoh", "mask_ip", "192.168.0.1") </programlisting> </example> </section> - <section> + <section id="topoh.p.mask_callid"> <title><varname>mask_callid</varname> (integer)</title> <para> Whether to encode the Call-id: header. Some SIP extensions include @@ -136,7 +136,7 @@ modparam("topoh", "mask_callid", 1) </programlisting> </example> </section> - <section> + <section id="topoh.p.uparam_name"> <title><varname>uparam_name</varname> (str)</title> <para> Name of URI parameter where to store encoded value. @@ -155,7 +155,7 @@ modparam("topoh", "uparam_name", "myparam") </programlisting> </example> </section> - <section> + <section id="topoh.p.uparam_prefix"> <title><varname>uparam_prefix</varname> (str)</title> <para> Prefix to be added in encoded URI parameters. @@ -174,7 +174,7 @@ modparam("topoh", "uparam_prefix", "xyz") </programlisting> </example> </section> - <section> + <section id="topoh.p.vparam_name"> <title><varname>vparam_name</varname> (str)</title> <para> Name of Via: parameter used to store encoded value. @@ -193,7 +193,7 @@ modparam("topoh", "vparam_name", "myv") </programlisting> </example> </section> - <section> + <section id="topoh.p.vparam_prefix"> <title><varname>vparam_prefix</varname> (str)</title> <para> Prefix to be added in encoded Via: parameters. @@ -212,7 +212,7 @@ modparam("topoh", "vparam_prefix", "xyz") </programlisting> </example> </section> - <section> + <section id="topoh.p.callid_prefix"> <title><varname>callid_prefix</varname> (str)</title> <para> Prefix to be added in encoded Call-ID: headers. @@ -231,7 +231,7 @@ modparam("topoh", "callid_prefix", "***") </programlisting> </example> </section> - <section> + <section id="topoh.p.sanity_checks"> <title><varname>sanity_checks</varname> (integer)</title> <para> If set to 1, topoh module will bind to sanity module in order @@ -253,7 +253,7 @@ modparam("topoh", "sanity_checks", 1) </programlisting> </example> </section> - <section> + <section id="topoh.p.uri_prefix_checks"> <title><varname>uri_prefix_checks</varname> (integer)</title> <para> If set to 1, topoh module will check if URIs to be decoded match

6 years, 6 months

git:5.1:8d8fec64: nsq: removed obsolete json is_error() macro

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 8d8fec6496617ddad92b98acbcc2d6be4ef192e7 URL: https://github.com/kamailio/kamailio/commit/8d8fec6496617ddad92b98acbcc2d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:25:57+02:00 nsq: removed obsolete json is_error() macro (cherry picked from commit 586566c19a85a611d389062ca1f1de271e1891c3) --- Modified: src/modules/nsq/nsq_json.c --- Diff: https://github.com/kamailio/kamailio/commit/8d8fec6496617ddad92b98acbcc2d6b… Patch: https://github.com/kamailio/kamailio/commit/8d8fec6496617ddad92b98acbcc2d6b… --- diff --git a/src/modules/nsq/nsq_json.c b/src/modules/nsq/nsq_json.c index 85b817364a..a817b70ecd 100644 --- a/src/modules/nsq/nsq_json.c +++ b/src/modules/nsq/nsq_json.c @@ -110,7 +110,7 @@ struct json_object * nsq_json_get_field_object(str* json, str* field) struct json_object *j = json_tokener_parse(dup); pkg_free(dup); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON\n"); return NULL; }

6 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018