sr-dev December 2014

sr-dev@lists.kamailio.org

33 participants
255 discussions

Re: [sr-dev] [kamailio] usrloc_dmq: add module for usrloc sync via dmq (#3)

by Daniel-Constantin Mierla

Just short update that we are going to use github as main git repository starting with next week, making easier to review and accept this patch here, rather than do it it manually to git.sip-router.org. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3#issuecomment-66443653

9 years, 11 months

git:4.1: dialog: reset local variables shortcuts after reply and failure processing

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 30168fee88d89c5bc640b54d1300eb5e670873e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30168fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 10 11:16:54 2014 +0100 dialog: reset local variables shortcuts after reply and failure processing - avoid using wrong values to find dialogs with processing of next messages - reported by Julia Boudniatsky - backport of: dcdb73d792719e38844eef60f821365b587893d7 (master) 8a6660697bf08d0522fcd7ffa60698ebcdc4f990 (4.2.) --- modules/dialog/dialog.c | 10 ++++++++++ modules/dialog/dlg_profile.c | 21 +++++++++++++++++++++ modules/dialog/dlg_profile.h | 10 ++++++++++ modules/dialog/dlg_var.c | 15 +++++++++++++++ modules/dialog/dlg_var.h | 2 ++ 5 files changed, 58 insertions(+), 0 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index bcf8af0..566eb0d 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -644,6 +644,16 @@ static int mod_init(void) return -1; } + if (register_script_cb( cb_dlg_locals_reset, POST_SCRIPT_CB|ONREPLY_CB_TYPE,0)<0) { + LM_ERR("cannot register reply post-script dlg locals reset callback\n"); + return -1; + } + + if (register_script_cb( cb_dlg_locals_reset, POST_SCRIPT_CB|FAILURE_CB_TYPE,0)<0) { + LM_ERR("cannot register failure post-script dlg locals reset callback\n"); + return -1; + } + if ( register_timer( dlg_timer_routine, 0, 1)<0 ) { LM_ERR("failed to register timer \n"); return -1; diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index b2af30e..298e240 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -292,6 +292,27 @@ void destroy_linkers(struct dlg_profile_link *linker) /*! + * \brief Callback for cleanup of profile local vars + * \param msg SIP message + * \param flags unused + * \param param unused + * \return 1 + */ +int cb_profile_reset( struct sip_msg *msg, unsigned int flags, void *param ) +{ + current_dlg_msg_id = 0; + current_dlg_msg_pid = 0; + if (current_pending_linkers) { + destroy_linkers(current_pending_linkers); + current_pending_linkers = NULL; + } + + /* need to return non-zero - 0 will break the exec of the request */ + return 1; +} + + +/*! * \brief Cleanup a profile * \param msg SIP message * \param flags unused diff --git a/modules/dialog/dlg_profile.h b/modules/dialog/dlg_profile.h index 3b545c6..5cddbed 100644 --- a/modules/dialog/dlg_profile.h +++ b/modules/dialog/dlg_profile.h @@ -106,6 +106,16 @@ struct dlg_profile_table* search_dlg_profile(str *name); /*! + * \brief Callback for cleanup of profile local vars + * \param msg SIP message + * \param flags unused + * \param param unused + * \return 1 + */ +int cb_profile_reset( struct sip_msg *msg, unsigned int flags, void *param ); + + +/*! * \brief Cleanup a profile * \param msg SIP message * \param flags unused diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index e883e56..fd1e9b0 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -69,6 +69,21 @@ int dlg_cfg_cb(sip_msg_t *msg, unsigned int flags, void *cbp) return 1; } +int cb_dlg_cfg_reset(sip_msg_t *msg, unsigned int flags, void *cbp) +{ + memset(&_dlg_ctx, 0, sizeof(dlg_ctx_t)); + + return 1; +} + +int cb_dlg_locals_reset(sip_msg_t *msg, unsigned int flags, void *cbp) +{ + LM_DBG("resetting the local dialog shortcuts\n"); + cb_dlg_cfg_reset(msg, flags, cbp); + cb_profile_reset(msg, flags, cbp); + + return 1; +} static inline struct dlg_var *new_dlg_var(str *key, str *val) { diff --git a/modules/dialog/dlg_var.h b/modules/dialog/dlg_var.h index 0b878b3..dc36108 100644 --- a/modules/dialog/dlg_var.h +++ b/modules/dialog/dlg_var.h @@ -82,6 +82,8 @@ int pv_get_dlg(sip_msg_t *msg, pv_param_t *param, int pv_parse_dlg_name(pv_spec_p sp, str *in); int dlg_cfg_cb(sip_msg_t *foo, unsigned int flags, void *bar); +int cb_dlg_cfg_reset(sip_msg_t *msg, unsigned int flags, void *cbp); +int cb_dlg_locals_reset(sip_msg_t *msg, unsigned int flags, void *cbp); void dlg_set_ctx_iuid(dlg_cell_t *dlg); void dlg_reset_ctx_iuid(void);

9 years, 11 months

git:4.2: dialog: reset local variables shortcuts after reply and failure processing

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.2 Commit: 8a6660697bf08d0522fcd7ffa60698ebcdc4f990 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a66606… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 10 10:54:56 2014 +0100 dialog: reset local variables shortcuts after reply and failure processing - avoid using wrong values to find dialogs with processing of next messages - reported by Julia Boudniatsky (cherry picked from commit dcdb73d792719e38844eef60f821365b587893d7) --- modules/dialog/dialog.c | 10 ++++++++++ modules/dialog/dlg_profile.c | 21 +++++++++++++++++++++ modules/dialog/dlg_profile.h | 10 ++++++++++ modules/dialog/dlg_var.c | 15 +++++++++++++++ modules/dialog/dlg_var.h | 2 ++ 5 files changed, 58 insertions(+), 0 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 8cc0d5e..58c40da 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -626,6 +626,16 @@ static int mod_init(void) return -1; } + if (register_script_cb( cb_dlg_locals_reset, POST_SCRIPT_CB|ONREPLY_CB_TYPE,0)<0) { + LM_ERR("cannot register reply post-script dlg locals reset callback\n"); + return -1; + } + + if (register_script_cb( cb_dlg_locals_reset, POST_SCRIPT_CB|FAILURE_CB_TYPE,0)<0) { + LM_ERR("cannot register failure post-script dlg locals reset callback\n"); + return -1; + } + if(dlg_timer_procs<=0) { if ( register_timer( dlg_timer_routine, 0, 1)<0 ) { LM_ERR("failed to register timer \n"); diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 7e26e9c..b459ac5 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -409,6 +409,27 @@ int remove_profile(dlg_profile_table_t *profile, str *value, str *puid) /*! + * \brief Callback for cleanup of profile local vars + * \param msg SIP message + * \param flags unused + * \param param unused + * \return 1 + */ +int cb_profile_reset( struct sip_msg *msg, unsigned int flags, void *param ) +{ + current_dlg_msg_id = 0; + current_dlg_msg_pid = 0; + if (current_pending_linkers) { + destroy_linkers(current_pending_linkers); + current_pending_linkers = NULL; + } + + /* need to return non-zero - 0 will break the exec of the request */ + return 1; +} + + +/*! * \brief Cleanup a profile * \param msg SIP message * \param flags unused diff --git a/modules/dialog/dlg_profile.h b/modules/dialog/dlg_profile.h index 29625e4..07fb2b5 100644 --- a/modules/dialog/dlg_profile.h +++ b/modules/dialog/dlg_profile.h @@ -116,6 +116,16 @@ struct dlg_profile_table* search_dlg_profile(str *name); /*! + * \brief Callback for cleanup of profile local vars + * \param msg SIP message + * \param flags unused + * \param param unused + * \return 1 + */ +int cb_profile_reset( struct sip_msg *msg, unsigned int flags, void *param ); + + +/*! * \brief Cleanup a profile * \param msg SIP message * \param flags unused diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index c61cb7f..ccd316d 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -69,6 +69,21 @@ int dlg_cfg_cb(sip_msg_t *msg, unsigned int flags, void *cbp) return 1; } +int cb_dlg_cfg_reset(sip_msg_t *msg, unsigned int flags, void *cbp) +{ + memset(&_dlg_ctx, 0, sizeof(dlg_ctx_t)); + + return 1; +} + +int cb_dlg_locals_reset(sip_msg_t *msg, unsigned int flags, void *cbp) +{ + LM_DBG("resetting the local dialog shortcuts\n"); + cb_dlg_cfg_reset(msg, flags, cbp); + cb_profile_reset(msg, flags, cbp); + + return 1; +} static inline struct dlg_var *new_dlg_var(str *key, str *val) { diff --git a/modules/dialog/dlg_var.h b/modules/dialog/dlg_var.h index a8b43cd..7691a16 100644 --- a/modules/dialog/dlg_var.h +++ b/modules/dialog/dlg_var.h @@ -82,6 +82,8 @@ int pv_get_dlg(sip_msg_t *msg, pv_param_t *param, int pv_parse_dlg_name(pv_spec_p sp, str *in); int dlg_cfg_cb(sip_msg_t *foo, unsigned int flags, void *bar); +int cb_dlg_cfg_reset(sip_msg_t *msg, unsigned int flags, void *cbp); +int cb_dlg_locals_reset(sip_msg_t *msg, unsigned int flags, void *cbp); void dlg_set_ctx_iuid(dlg_cell_t *dlg); void dlg_reset_ctx_iuid(void);

9 years, 11 months

git:master: dialog: reset local variables shortcuts after reply and failure processing

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dcdb73d792719e38844eef60f821365b587893d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dcdb73d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 10 10:54:56 2014 +0100 dialog: reset local variables shortcuts after reply and failure processing - avoid using wrong values to find dialogs with processing of next messages - reported by Julia Boudniatsky --- modules/dialog/dialog.c | 10 ++++++++++ modules/dialog/dlg_profile.c | 21 +++++++++++++++++++++ modules/dialog/dlg_profile.h | 10 ++++++++++ modules/dialog/dlg_var.c | 15 +++++++++++++++ modules/dialog/dlg_var.h | 2 ++ 5 files changed, 58 insertions(+), 0 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 8cc0d5e..58c40da 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -626,6 +626,16 @@ static int mod_init(void) return -1; } + if (register_script_cb( cb_dlg_locals_reset, POST_SCRIPT_CB|ONREPLY_CB_TYPE,0)<0) { + LM_ERR("cannot register reply post-script dlg locals reset callback\n"); + return -1; + } + + if (register_script_cb( cb_dlg_locals_reset, POST_SCRIPT_CB|FAILURE_CB_TYPE,0)<0) { + LM_ERR("cannot register failure post-script dlg locals reset callback\n"); + return -1; + } + if(dlg_timer_procs<=0) { if ( register_timer( dlg_timer_routine, 0, 1)<0 ) { LM_ERR("failed to register timer \n"); diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 7e26e9c..b459ac5 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -409,6 +409,27 @@ int remove_profile(dlg_profile_table_t *profile, str *value, str *puid) /*! + * \brief Callback for cleanup of profile local vars + * \param msg SIP message + * \param flags unused + * \param param unused + * \return 1 + */ +int cb_profile_reset( struct sip_msg *msg, unsigned int flags, void *param ) +{ + current_dlg_msg_id = 0; + current_dlg_msg_pid = 0; + if (current_pending_linkers) { + destroy_linkers(current_pending_linkers); + current_pending_linkers = NULL; + } + + /* need to return non-zero - 0 will break the exec of the request */ + return 1; +} + + +/*! * \brief Cleanup a profile * \param msg SIP message * \param flags unused diff --git a/modules/dialog/dlg_profile.h b/modules/dialog/dlg_profile.h index 29625e4..07fb2b5 100644 --- a/modules/dialog/dlg_profile.h +++ b/modules/dialog/dlg_profile.h @@ -116,6 +116,16 @@ struct dlg_profile_table* search_dlg_profile(str *name); /*! + * \brief Callback for cleanup of profile local vars + * \param msg SIP message + * \param flags unused + * \param param unused + * \return 1 + */ +int cb_profile_reset( struct sip_msg *msg, unsigned int flags, void *param ); + + +/*! * \brief Cleanup a profile * \param msg SIP message * \param flags unused diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index c61cb7f..ccd316d 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -69,6 +69,21 @@ int dlg_cfg_cb(sip_msg_t *msg, unsigned int flags, void *cbp) return 1; } +int cb_dlg_cfg_reset(sip_msg_t *msg, unsigned int flags, void *cbp) +{ + memset(&_dlg_ctx, 0, sizeof(dlg_ctx_t)); + + return 1; +} + +int cb_dlg_locals_reset(sip_msg_t *msg, unsigned int flags, void *cbp) +{ + LM_DBG("resetting the local dialog shortcuts\n"); + cb_dlg_cfg_reset(msg, flags, cbp); + cb_profile_reset(msg, flags, cbp); + + return 1; +} static inline struct dlg_var *new_dlg_var(str *key, str *val) { diff --git a/modules/dialog/dlg_var.h b/modules/dialog/dlg_var.h index a8b43cd..7691a16 100644 --- a/modules/dialog/dlg_var.h +++ b/modules/dialog/dlg_var.h @@ -82,6 +82,8 @@ int pv_get_dlg(sip_msg_t *msg, pv_param_t *param, int pv_parse_dlg_name(pv_spec_p sp, str *in); int dlg_cfg_cb(sip_msg_t *foo, unsigned int flags, void *bar); +int cb_dlg_cfg_reset(sip_msg_t *msg, unsigned int flags, void *cbp); +int cb_dlg_locals_reset(sip_msg_t *msg, unsigned int flags, void *cbp); void dlg_set_ctx_iuid(dlg_cell_t *dlg); void dlg_reset_ctx_iuid(void);

9 years, 11 months

git:4.2: registrar: Fix memory leak around path and outbound header parsing

by Hugh Waite

Module: sip-router Branch: 4.2 Commit: 2f04794b8357ccfa1304ce53ff5795c6f4f0ca7f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f04794… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Dec 9 19:05:31 2014 +0000 registrar: Fix memory leak around path and outbound header parsing - Fix leak of parsed URI and URI parameters during a call to save() (cherry picked from commit 56c880120c07443eceb732117f0f1aa3558dcfe5) --- modules/registrar/path.c | 10 ++-------- modules/registrar/save.c | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/registrar/path.c b/modules/registrar/path.c index 9f9ed38..0e242e3 100644 --- a/modules/registrar/path.c +++ b/modules/registrar/path.c @@ -96,6 +96,8 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) LM_ERR("failed to parse parameters of first hop\n"); goto error; } + /* Not interested in param body - just the hooks */ + free_params(params); if (hooks.contact.received) { uri_str.s = uri_buf; @@ -107,14 +109,6 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) *received = uri_str; LM_DBG("received is <%.*s>\n", received->len, received->s); } - - /*for (;params; params = params->next) { - if (params->type == P_RECEIVED) { - *received = hooks.contact.received->body; - break; - } - }*/ - free_params(params); } free_rr(&route); } diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 89a97f6..a3a5b29 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -923,17 +923,21 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } if (parse_uri(route->nameaddr.uri.s, route->nameaddr.uri.len, &puri) < 0) { LM_ERR("Failed to parse Path: URI\n"); + free_rr(&route); goto error; } if (parse_params(&puri.params, CLASS_URI, &hooks, &params) != 0) { LM_ERR("Failed to parse Path: URI parameters\n"); + free_rr(&route); goto error; } + /* Not interested in param body - just the hooks */ + free_params(params); if (!hooks.uri.ob) { /* No ;ob parameter to top Path: URI - no outbound */ use_ob = 0; } - + free_rr(&route); } else { /* No Path: header - no outbound */ use_ob = 0;

9 years, 11 months

git:4.1: registrar: Fix memory leak around path and outbound header parsing

by Hugh Waite

Module: sip-router Branch: 4.1 Commit: 98091fef61e360627a18572619dd026fa4fa1acb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98091fe… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Dec 9 19:05:31 2014 +0000 registrar: Fix memory leak around path and outbound header parsing - Fix leak of parsed URI and URI parameters during a call to save() (cherry picked from commit 56c880120c07443eceb732117f0f1aa3558dcfe5) --- modules/registrar/path.c | 10 ++-------- modules/registrar/save.c | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/registrar/path.c b/modules/registrar/path.c index cefd59a..1ce7c31 100644 --- a/modules/registrar/path.c +++ b/modules/registrar/path.c @@ -96,6 +96,8 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) LM_ERR("failed to parse parameters of first hop\n"); goto error; } + /* Not interested in param body - just the hooks */ + free_params(params); if (hooks.contact.received) { uri_str.s = uri_buf; @@ -107,14 +109,6 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) *received = uri_str; LM_DBG("received is <%.*s>\n", received->len, received->s); } - - /*for (;params; params = params->next) { - if (params->type == P_RECEIVED) { - *received = hooks.contact.received->body; - break; - } - }*/ - free_params(params); } free_rr(&route); } diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 7882332..fd5471b 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -923,17 +923,21 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } if (parse_uri(route->nameaddr.uri.s, route->nameaddr.uri.len, &puri) < 0) { LM_ERR("Failed to parse Path: URI\n"); + free_rr(&route); goto error; } if (parse_params(&puri.params, CLASS_URI, &hooks, &params) != 0) { LM_ERR("Failed to parse Path: URI parameters\n"); + free_rr(&route); goto error; } + /* Not interested in param body - just the hooks */ + free_params(params); if (!hooks.uri.ob) { /* No ;ob parameter to top Path: URI - no outbound */ use_ob = 0; } - + free_rr(&route); } else { /* No Path: header - no outbound */ use_ob = 0;

9 years, 11 months

Wiki contributions

by Olle E. Johansson

Hi! There are users on IRC that like to contribute to our documentation with how-to guides. I can set up a structure for that on the wiki, but wants to stay assured that information copied on the wiki freely can be copied to module READMEs if they add value. Do we have a clear understanding under what terms wiki contributions to the project are done? Is it possible to copy text from the wiki to the source code docs, like INSTALL and module docs without breaking any license? Cheers, /O

9 years, 11 months

[tracker] Comment added: dialplan: allow match/subst rules with variables

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#429 - dialplan: allow match/subst rules with variables User who did this - Daniel-Constantin Mierla (miconda) ---------- I pushed to master branch an alternative implementation. It took a while to analyze the patch, being quite big -- there are couple of issues that could have been fixed (such as: module might be used by workers with negative rank, like timer or rpc -- there is a mi/rpc command for translation; return at first pv detected in a string to mark it as a string with vars; handling ending $ and allowing $$ in values), but the main issue is that cloning data in private memory is not really feasible always, because can be tons of dialplan db records. It would mean to have each process with a lot of pkg memory. Only parsing of values can be cached (to have the broken down list of static strings and variables). But given that parsed values have to be searched anyhow in a hash table, I expected to be no real performance difference than parsing every time. Evaluating the value at runtime, compiling and freeing PCRE have to be done for each attempt to match in dialplan rules. Considering the complexity of managing a private cache of parsed values, my patch is parsing the values at runtime, if they are detected to have variables at load time. In summary, the way it was done: - detection stops at first variable found in a value -- the function has been added in dialplan to cope properly with $ at the end of values - each value for match and subst is marked with a flag during load if there is a var inside it - when it is a var in a value that ends with a single $, in memory it is stored with $$ at the end (one more $ is added at the end), so at runtime the evaluation results in a single $. It avoids keeping other flags and doing more conditions at runtime to cope with single $ parsing - parsing of values to tokenize variables is done at runtime, with compile of PCRE and afferent freeing afterwards - there is a module parameter 'match_dynamic' that has to be set to 1 in order to enable this feature Let me know if anyone has comments on this approach, if not, I will close this item. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=429#comment1661 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 11 months

[tracker] Task closed: dialplan: allow match/subst rules with variables

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#429 - dialplan: allow match/subst rules with variables User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented Additional comments about closing: Thanks for your review and alternative implentation. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=429 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 11 months

git:master: registrar: Fix memory leak around path and outbound header parsing

by Hugh Waite

Module: sip-router Branch: master Commit: 56c880120c07443eceb732117f0f1aa3558dcfe5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56c8801… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Dec 9 19:05:31 2014 +0000 registrar: Fix memory leak around path and outbound header parsing - Fix leak or parsed URI and URI parameter during a call to save() --- modules/registrar/path.c | 10 ++-------- modules/registrar/save.c | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/registrar/path.c b/modules/registrar/path.c index 9f9ed38..0e242e3 100644 --- a/modules/registrar/path.c +++ b/modules/registrar/path.c @@ -96,6 +96,8 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) LM_ERR("failed to parse parameters of first hop\n"); goto error; } + /* Not interested in param body - just the hooks */ + free_params(params); if (hooks.contact.received) { uri_str.s = uri_buf; @@ -107,14 +109,6 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) *received = uri_str; LM_DBG("received is <%.*s>\n", received->len, received->s); } - - /*for (;params; params = params->next) { - if (params->type == P_RECEIVED) { - *received = hooks.contact.received->body; - break; - } - }*/ - free_params(params); } free_rr(&route); } diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 89a97f6..a3a5b29 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -923,17 +923,21 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } if (parse_uri(route->nameaddr.uri.s, route->nameaddr.uri.len, &puri) < 0) { LM_ERR("Failed to parse Path: URI\n"); + free_rr(&route); goto error; } if (parse_params(&puri.params, CLASS_URI, &hooks, &params) != 0) { LM_ERR("Failed to parse Path: URI parameters\n"); + free_rr(&route); goto error; } + /* Not interested in param body - just the hooks */ + free_params(params); if (!hooks.uri.ob) { /* No ;ob parameter to top Path: URI - no outbound */ use_ob = 0; } - + free_rr(&route); } else { /* No Path: header - no outbound */ use_ob = 0;

9 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2014