sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:kamailio_3.0: modules_k/dialog: Revert "Prevent 'unable to find dialog' WARN

by Timo Reimann

Module: sip-router Branch: kamailio_3.0 Commit: 2e570f72f82e9cf29a6e0a2b73e4019c8820847b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e570f7… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 5 17:23:34 2010 +0200 modules_k/dialog: Revert "Prevent 'unable to find dialog' WARN messages caused by accessing a dialog in the "deleted" state". The approach chosen was incomplete as it requires extending checks of return values for all calls to get_dlg() and lookup_dlg() against POINTER_CLOSED_MARKER. Otherwise, it may lead to server crashes when code mistakes POINTER_CLOSED_MARKER for an existing dialog. However, having to check against two return values requires a lot of logic changes. Therefore, a better approach will be taken in a follow-up commit. This reverts commit 9b7f25d7196e41cbcc77c1d6e316cb1a8664ed81. (cherry picked from commit 0723496c037d8e22210861d6a0e9041351097f63) --- modules_k/dialog/dlg_cb.c | 2 ++ modules_k/dialog/dlg_handlers.c | 6 +----- modules_k/dialog/dlg_hash.c | 7 +++---- modules_k/dialog/dlg_hash.h | 2 -- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modules_k/dialog/dlg_cb.c b/modules_k/dialog/dlg_cb.c index 464083e..24b3b39 100644 --- a/modules_k/dialog/dlg_cb.c +++ b/modules_k/dialog/dlg_cb.c @@ -43,6 +43,8 @@ static struct dlg_head_cbl* load_cbs = 0; static struct dlg_cb_params params = {NULL, DLG_DIR_NONE, NULL, NULL}; +#define POINTER_CLOSED_MARKER ((void *)(-1)) + static void run_load_callback(struct dlg_callback *cb); diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index a3610cc..976ac0f 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -824,11 +824,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) return; dlg = lookup_dlg( h_entry, h_id); - if (dlg == POINTER_CLOSED_MARKER) { - LM_DBG("dialog marked for destruction, ignoring\n"); - return; - } - else if (dlg==0) { + if (dlg==0) { LM_WARN("unable to find dialog for %.*s " "with route param '%.*s' [%u:%u]\n", req->first_line.u.request.method.len, diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index b3d626b..6df21e3 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -378,8 +378,7 @@ struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id) if (dlg->h_id == h_id) { if (dlg->state==DLG_STATE_DELETED) { dlg_unlock( d_table, d_entry); - LM_DBG("dialog id=%u on entry %u marked for deletion\n", h_id, h_entry); - return POINTER_CLOSED_MARKER; + goto not_found; } dlg->ref++; LM_DBG("ref dlg %p with 1 -> %d\n", dlg, dlg->ref); @@ -419,9 +418,8 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, /* Check callid / fromtag / totag */ if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { if (dlg->state==DLG_STATE_DELETED) { - LM_DBG("dialog callid='%.*s' marked for deletion\n", callid->len, callid->s); dlg_unlock( d_table, d_entry); - return POINTER_CLOSED_MARKER; + goto not_found; } dlg->ref++; LM_DBG("ref dlg %p with 1 -> %d\n", dlg, dlg->ref); @@ -434,6 +432,7 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, dlg_unlock( d_table, d_entry); +not_found: LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; } diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index 6aa6db5..889a318 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -83,8 +83,6 @@ #define DLG_DIR_DOWNSTREAM 1 /*!< dialog has downstream direction */ #define DLG_DIR_UPSTREAM 2 /*!< dialog has upstream direction */ -#define POINTER_CLOSED_MARKER ((void *)(-1)) - /*! entries in the dialog list */ struct dlg_cell

14 years, 6 months

git:kamailio_3.0: modules_k/dialog: Provide new fix to prevent " unable to find

by Timo Reimann

Module: sip-router Branch: kamailio_3.0 Commit: 7dfea988c61544752b4c5fef642d9599c20f36c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7dfea98… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 5 18:12:17 2010 +0200 modules_k/dialog: Provide new fix to prevent "unable to find dialog" WARN messages caused by accessing a dialog in the "deleted" state (often happens with simultaneous BYE requests when both UAs hang up at the same time). This commit uses a different approach where a "deleted" flag is set in get_dlg() and lookup_dlg() which callers may evaluate. Callers who only care about existing dialogs can ignore the flag by passing a NULL argument. The commit "replaces" 9b7f25d7 and follows up 0723496c. (cherry picked from commit d1693b2c64dfc44f0271bdd1c38315578ebe7135) --- modules_k/dialog/dialog.c | 2 +- modules_k/dialog/dlg_handlers.c | 13 +++++++++++-- modules_k/dialog/dlg_hash.c | 22 +++++++++++++++++----- modules_k/dialog/dlg_hash.h | 6 ++++-- modules_k/dialog/dlg_req_within.c | 2 +- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index e2bff0b..d58ea4b 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -1048,7 +1048,7 @@ static int w_dlg_get(struct sip_msg *msg, char *ci, char *ft, char *tt) return -1; } - dlg = get_dlg(&sc, &sf, &st, &dir); + dlg = get_dlg(&sc, &sf, &st, &dir, NULL); if(dlg==NULL) return -1; current_dlg_pointer = dlg; diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 976ac0f..5e5e3c5 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -795,6 +795,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) str val, callid, ftag, ttag; int h_entry, h_id, new_state, old_state, unref, event, timeout; unsigned int dir; + unsigned int del; int ret = 0; if (current_dlg_pointer!=NULL) @@ -823,7 +824,11 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) if ( parse_dlg_rr_param( val.s, val.s+val.len, &h_entry, &h_id)<0 ) return; - dlg = lookup_dlg( h_entry, h_id); + dlg = lookup_dlg( h_entry, h_id, &del); + if (del == 1) { + LM_DBG("dialog marked for deletion, ignoring\n"); + return; + } if (dlg==0) { LM_WARN("unable to find dialog for %.*s " "with route param '%.*s' [%u:%u]\n", @@ -871,7 +876,11 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) return; /* TODO - try to use the RR dir detection to speed up here the * search -bogdan */ - dlg = get_dlg(&callid, &ftag, &ttag, &dir); + dlg = get_dlg(&callid, &ftag, &ttag, &dir, &del); + if (del == 1) { + LM_DBG("dialog marked for deletion, ignoring\n"); + return; + } if (!dlg){ LM_DBG("Callid '%.*s' not found\n", req->callid->body.len, req->callid->body.s); diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 6df21e3..58332a6 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -362,11 +362,14 @@ error: * \param h_id id of the hash table entry * \return dialog on success, NULL on failure */ -struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id) +struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id, unsigned int *del) { struct dlg_cell *dlg; struct dlg_entry *d_entry; + if (del != NULL) + *del = 0; + if (h_entry>=d_table->size) goto not_found; @@ -377,6 +380,8 @@ struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id) for( dlg=d_entry->first ; dlg ; dlg=dlg->next ) { if (dlg->h_id == h_id) { if (dlg->state==DLG_STATE_DELETED) { + if (del != NULL) + *del = 1; dlg_unlock( d_table, d_entry); goto not_found; } @@ -405,11 +410,15 @@ not_found: * \return dialog structure on success, NULL on failure */ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, - str *callid, str *ftag, str *ttag, unsigned int *dir) + str *callid, str *ftag, str *ttag, unsigned int *dir, + unsigned int *del) { struct dlg_cell *dlg; struct dlg_entry *d_entry; + if (del != NULL) + *del = 0; + d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); @@ -418,6 +427,8 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, /* Check callid / fromtag / totag */ if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { if (dlg->state==DLG_STATE_DELETED) { + if (del != NULL) + *del = 1; dlg_unlock( d_table, d_entry); goto not_found; } @@ -453,14 +464,15 @@ not_found: * \param dir direction * \return dialog structure on success, NULL on failure */ -struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir) +struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir, + unsigned int *del) { struct dlg_cell *dlg; if ((dlg = internal_get_dlg(core_hash(callid, ftag->len?ftag:0, - d_table->size), callid, ftag, ttag, dir)) == 0 && + d_table->size), callid, ftag, ttag, dir, del)) == 0 && (dlg = internal_get_dlg(core_hash(callid, ttag->len - ?ttag:0, d_table->size), callid, ftag, ttag, dir)) == 0) { + ?ttag:0, d_table->size), callid, ftag, ttag, dir, del)) == 0) { LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; } diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index 889a318..e555837 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -243,9 +243,10 @@ int dlg_update_cseq(struct dlg_cell *dlg, unsigned int leg, str *cseq); * \brief Lookup a dialog in the global list * \param h_entry number of the hash table entry * \param h_id id of the hash table entry + * \param del unless null, flag that is set if dialog is in "deleted" state * \return dialog on success, NULL on failure */ -struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id); +struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id, unsigned int *del); /*! @@ -260,9 +261,10 @@ struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id); * \param ftag from tag * \param ttag to tag * \param dir direction + * \param del unless null, flag that is set if dialog is in "deleted" state * \return dialog structure on success, NULL on failure */ -struct dlg_cell* get_dlg(str *callid, str *ftag, str *ttag, unsigned int *dir); +struct dlg_cell* get_dlg(str *callid, str *ftag, str *ttag, unsigned int *dir, unsigned int *del); /*! diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index aae12fd..3b6c57d 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -317,7 +317,7 @@ struct mi_root * mi_terminate_dlg(struct mi_root *cmd_tree, void *param ){ LM_DBG("h_entry %u h_id %u\n", h_entry, h_id); - dlg = lookup_dlg(h_entry, h_id); + dlg = lookup_dlg(h_entry, h_id, NULL); // lookup_dlg has incremented the reference count

14 years, 6 months

git:master: modules_k/dialog: Provide new fix to prevent "unable to find

by Timo Reimann

Module: sip-router Branch: master Commit: d1693b2c64dfc44f0271bdd1c38315578ebe7135 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1693b2… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 5 17:48:30 2010 +0200 modules_k/dialog: Provide new fix to prevent "unable to find dialog" WARN messages caused by accessing a dialog in the "deleted" state (often happens with simultaneous BYE requests when both UAs hang up at the same time). This commit uses a different approach where a "deleted" flag is set in get_dlg() and lookup_dlg() which callers may evaluate. Callers who only care about existing dialogs can ignore the flag by passing a NULL argument. The commit "replaces" 9b7f25d7 and follows up 0723496c. --- modules_k/dialog/dialog.c | 4 ++-- modules_k/dialog/dlg_handlers.c | 20 +++++++++++++++++--- modules_k/dialog/dlg_hash.c | 22 +++++++++++++++++----- modules_k/dialog/dlg_hash.h | 6 ++++-- modules_k/dialog/dlg_req_within.c | 2 +- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index f965a06..0ca60b4 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -1064,7 +1064,7 @@ static int w_dlg_get(struct sip_msg *msg, char *ci, char *ft, char *tt) return -1; } - dlg = get_dlg(&sc, &sf, &st, &dir); + dlg = get_dlg(&sc, &sf, &st, &dir, NULL); if(dlg==NULL) return -1; current_dlg_pointer = dlg; @@ -1351,7 +1351,7 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { if (rpc->scan(c, "ddS", &h_entry, &h_id, &rpc_extra_hdrs) < 2) return; - dlg = lookup_dlg(h_entry, h_id); + dlg = lookup_dlg(h_entry, h_id, NULL); if(dlg){ dlg_bye_all(dlg, (rpc_extra_hdrs.len>0)?&rpc_extra_hdrs:NULL); unref_dlg(dlg, 1); diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 1e9a1b3..ef1e23f 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -542,6 +542,7 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) str ftag; str ttag; unsigned int dir; + unsigned int del; struct sip_msg *req = param->req; if((req->flags&dlg_flag)!=dlg_flag) @@ -565,7 +566,11 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) LM_WARN("pre-matching failed\n"); return; } - dlg = get_dlg(&callid, &ftag, &ttag, &dir); + dlg = get_dlg(&callid, &ftag, &ttag, &dir, &del); + if (del == 1) { + LM_DBG("dialog marked for deletion, ignoring\n"); + return; + } if (!dlg){ LM_DBG("Callid '%.*s' not found, must be a new dialog\n", req->callid->body.len, req->callid->body.s); @@ -837,6 +842,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) str val, callid, ftag, ttag; int h_entry, h_id, new_state, old_state, unref, event, timeout; unsigned int dir; + unsigned int del; int ret = 0; if (current_dlg_pointer!=NULL) @@ -865,7 +871,11 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) if ( parse_dlg_rr_param( val.s, val.s+val.len, &h_entry, &h_id)<0 ) return; - dlg = lookup_dlg( h_entry, h_id); + dlg = lookup_dlg( h_entry, h_id, &del); + if (del == 1) { + LM_DBG("dialog marked for deletion, ignoring\n"); + return; + } if (dlg==0) { LM_WARN("unable to find dialog for %.*s " "with route param '%.*s' [%u:%u]\n", @@ -913,7 +923,11 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) return; /* TODO - try to use the RR dir detection to speed up here the * search -bogdan */ - dlg = get_dlg(&callid, &ftag, &ttag, &dir); + dlg = get_dlg(&callid, &ftag, &ttag, &dir, &del); + if (del == 1) { + LM_DBG("dialog marked for deletion, ignoring\n"); + return; + } if (!dlg){ LM_DBG("Callid '%.*s' not found\n", req->callid->body.len, req->callid->body.s); diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 6df21e3..58332a6 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -362,11 +362,14 @@ error: * \param h_id id of the hash table entry * \return dialog on success, NULL on failure */ -struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id) +struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id, unsigned int *del) { struct dlg_cell *dlg; struct dlg_entry *d_entry; + if (del != NULL) + *del = 0; + if (h_entry>=d_table->size) goto not_found; @@ -377,6 +380,8 @@ struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id) for( dlg=d_entry->first ; dlg ; dlg=dlg->next ) { if (dlg->h_id == h_id) { if (dlg->state==DLG_STATE_DELETED) { + if (del != NULL) + *del = 1; dlg_unlock( d_table, d_entry); goto not_found; } @@ -405,11 +410,15 @@ not_found: * \return dialog structure on success, NULL on failure */ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, - str *callid, str *ftag, str *ttag, unsigned int *dir) + str *callid, str *ftag, str *ttag, unsigned int *dir, + unsigned int *del) { struct dlg_cell *dlg; struct dlg_entry *d_entry; + if (del != NULL) + *del = 0; + d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); @@ -418,6 +427,8 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, /* Check callid / fromtag / totag */ if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { if (dlg->state==DLG_STATE_DELETED) { + if (del != NULL) + *del = 1; dlg_unlock( d_table, d_entry); goto not_found; } @@ -453,14 +464,15 @@ not_found: * \param dir direction * \return dialog structure on success, NULL on failure */ -struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir) +struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir, + unsigned int *del) { struct dlg_cell *dlg; if ((dlg = internal_get_dlg(core_hash(callid, ftag->len?ftag:0, - d_table->size), callid, ftag, ttag, dir)) == 0 && + d_table->size), callid, ftag, ttag, dir, del)) == 0 && (dlg = internal_get_dlg(core_hash(callid, ttag->len - ?ttag:0, d_table->size), callid, ftag, ttag, dir)) == 0) { + ?ttag:0, d_table->size), callid, ftag, ttag, dir, del)) == 0) { LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; } diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index 889a318..e555837 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -243,9 +243,10 @@ int dlg_update_cseq(struct dlg_cell *dlg, unsigned int leg, str *cseq); * \brief Lookup a dialog in the global list * \param h_entry number of the hash table entry * \param h_id id of the hash table entry + * \param del unless null, flag that is set if dialog is in "deleted" state * \return dialog on success, NULL on failure */ -struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id); +struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id, unsigned int *del); /*! @@ -260,9 +261,10 @@ struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id); * \param ftag from tag * \param ttag to tag * \param dir direction + * \param del unless null, flag that is set if dialog is in "deleted" state * \return dialog structure on success, NULL on failure */ -struct dlg_cell* get_dlg(str *callid, str *ftag, str *ttag, unsigned int *dir); +struct dlg_cell* get_dlg(str *callid, str *ftag, str *ttag, unsigned int *dir, unsigned int *del); /*! diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index aae12fd..3b6c57d 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -317,7 +317,7 @@ struct mi_root * mi_terminate_dlg(struct mi_root *cmd_tree, void *param ){ LM_DBG("h_entry %u h_id %u\n", h_entry, h_id); - dlg = lookup_dlg(h_entry, h_id); + dlg = lookup_dlg(h_entry, h_id, NULL); // lookup_dlg has incremented the reference count

14 years, 6 months

git:master: modules_k/dialog: Revert "Prevent 'unable to find dialog' WARN

by Timo Reimann

Module: sip-router Branch: master Commit: 0723496c037d8e22210861d6a0e9041351097f63 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0723496… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 5 17:23:34 2010 +0200 modules_k/dialog: Revert "Prevent 'unable to find dialog' WARN messages caused by accessing a dialog in the "deleted" state". The approach chosen was incomplete as it requires extending checks of return values for all calls to get_dlg() and lookup_dlg() against POINTER_CLOSED_MARKER. Otherwise, it may lead to server crashes when code mistakes POINTER_CLOSED_MARKER for an existing dialog. However, having to check against two return values requires a lot of logic changes. Therefore, a better approach will be taken in a follow-up commit. This reverts commit 9b7f25d7196e41cbcc77c1d6e316cb1a8664ed81. --- modules_k/dialog/dlg_cb.c | 2 ++ modules_k/dialog/dlg_handlers.c | 6 +----- modules_k/dialog/dlg_hash.c | 7 +++---- modules_k/dialog/dlg_hash.h | 2 -- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modules_k/dialog/dlg_cb.c b/modules_k/dialog/dlg_cb.c index 464083e..24b3b39 100644 --- a/modules_k/dialog/dlg_cb.c +++ b/modules_k/dialog/dlg_cb.c @@ -43,6 +43,8 @@ static struct dlg_head_cbl* load_cbs = 0; static struct dlg_cb_params params = {NULL, DLG_DIR_NONE, NULL, NULL}; +#define POINTER_CLOSED_MARKER ((void *)(-1)) + static void run_load_callback(struct dlg_callback *cb); diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 77ad7ca..1e9a1b3 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -866,11 +866,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) return; dlg = lookup_dlg( h_entry, h_id); - if (dlg == POINTER_CLOSED_MARKER) { - LM_DBG("dialog marked for destruction, ignoring\n"); - return; - } - else if (dlg==0) { + if (dlg==0) { LM_WARN("unable to find dialog for %.*s " "with route param '%.*s' [%u:%u]\n", req->first_line.u.request.method.len, diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index b3d626b..6df21e3 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -378,8 +378,7 @@ struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id) if (dlg->h_id == h_id) { if (dlg->state==DLG_STATE_DELETED) { dlg_unlock( d_table, d_entry); - LM_DBG("dialog id=%u on entry %u marked for deletion\n", h_id, h_entry); - return POINTER_CLOSED_MARKER; + goto not_found; } dlg->ref++; LM_DBG("ref dlg %p with 1 -> %d\n", dlg, dlg->ref); @@ -419,9 +418,8 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, /* Check callid / fromtag / totag */ if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { if (dlg->state==DLG_STATE_DELETED) { - LM_DBG("dialog callid='%.*s' marked for deletion\n", callid->len, callid->s); dlg_unlock( d_table, d_entry); - return POINTER_CLOSED_MARKER; + goto not_found; } dlg->ref++; LM_DBG("ref dlg %p with 1 -> %d\n", dlg, dlg->ref); @@ -434,6 +432,7 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, dlg_unlock( d_table, d_entry); +not_found: LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; } diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index 6aa6db5..889a318 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -83,8 +83,6 @@ #define DLG_DIR_DOWNSTREAM 1 /*!< dialog has downstream direction */ #define DLG_DIR_UPSTREAM 2 /*!< dialog has upstream direction */ -#define POINTER_CLOSED_MARKER ((void *)(-1)) - /*! entries in the dialog list */ struct dlg_cell

14 years, 6 months

git:master: added missing database files for dbtext and berkley

by Marius Ovidiu Bucur

Module: sip-router Branch: master Commit: 5dacff0515a4ce347fd77d8049bab426d527a8ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5dacff0… Author: Marius Bucur <marius(a)dsl-core.(none)> Committer: Marius Bucur <marius(a)dsl-core.(none)> Date: Thu Aug 5 10:48:23 2010 +0200 added missing database files for dbtext and berkley --- utils/kamctl/db_berkeley/kamailio/matrix | 10 ++++++++++ utils/kamctl/dbtext/kamailio/matrix | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/matrix b/utils/kamctl/db_berkeley/kamailio/matrix new file mode 100644 index 0000000..a2e07b3 --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/matrix @@ -0,0 +1,10 @@ +METADATA_COLUMNS +first(int) second(int) res(int) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|NIL|NIL diff --git a/utils/kamctl/dbtext/kamailio/matrix b/utils/kamctl/dbtext/kamailio/matrix new file mode 100644 index 0000000..5f86e10 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/matrix @@ -0,0 +1 @@ +first(int) second(int) res(int)

14 years, 6 months

git:master: Merge branch 'master' of ssh://mariusbucur@git.sip-router.org/ sip-router

by Marius Ovidiu Bucur

Module: sip-router Branch: master Commit: 3fe8eea70560205d8ffe6b82902ea717d0e33279 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3fe8eea… Author: Marius Bucur <marius(a)dsl-core.(none)> Committer: Marius Bucur <marius(a)dsl-core.(none)> Date: Thu Aug 5 10:50:11 2010 +0200 Merge branch 'master' of ssh://mariusbucur@git.sip-router.org/sip-router ---

14 years, 6 months

git:kamailio_3.0: modules:carrierroute Better handling of fclose

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: b5ef768bcabf905d455ca26225c55f858cbe4c48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5ef768… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 5 11:31:02 2010 +0300 modules:carrierroute Better handling of fclose --- modules/carrierroute/cr_config.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 1f0775a..51a81d9 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -168,7 +168,8 @@ static int backup_config(void) { if (fclose(from)==EOF) { LM_ERR("Error closing source file.\n"); - goto errclose; + fclose(to); + goto errout; } if (fclose(to)==EOF) {

14 years, 6 months

git:master: modules/carrierroute Fixed resource leak in case of error

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2c034db7a3dc22886ad9b848d0c105a26f72e256 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c034db… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 5 11:08:17 2010 +0300 modules/carrierroute Fixed resource leak in case of error 2 FILE* where leaked(fclose was not called) in file mode on the error paths. --- modules/carrierroute/cr_config.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 8b37fe6..92f96a9 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -157,17 +157,18 @@ static int backup_config(void) { ch = fgetc(from); if (ferror(from)) { LM_ERR("Error reading source file.\n"); - goto errout; + goto errclose; } if (!feof(from)) fputc(ch, to); if (ferror(to)) { LM_ERR("Error writing destination file.\n"); - goto errout; + goto errclose; } } if (fclose(from)==EOF) { LM_ERR("Error closing source file.\n"); + fclose(to); goto errout; } @@ -178,6 +179,10 @@ static int backup_config(void) { LM_NOTICE("backup written to %s\n", backup_file); pkg_free(backup_file); return 0; +errclose: + /* close the files so that resource leak is prevented ; ignore errors*/ + fclose(from); + fclose(to); errout: pkg_free(backup_file); return -1;

14 years, 6 months

git:kamailio_3.0: modules/carrierroute: Prevent resource leak in case of error

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: 821a4322a0902b827add7913705f72d5e50176b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=821a432… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 5 11:02:14 2010 +0300 modules/carrierroute: Prevent resource leak in case of error the 2 FILE* opened in file mode where not properly closed on all code paths --- modules/carrierroute/cr_config.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 87969fa..1f0775a 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -157,18 +157,18 @@ static int backup_config(void) { ch = fgetc(from); if (ferror(from)) { LM_ERR("Error reading source file.\n"); - goto errout; + goto errclose; } if (!feof(from)) fputc(ch, to); if (ferror(to)) { LM_ERR("Error writing destination file.\n"); - goto errout; + goto errclose; } } if (fclose(from)==EOF) { LM_ERR("Error closing source file.\n"); - goto errout; + goto errclose; } if (fclose(to)==EOF) { @@ -178,6 +178,10 @@ static int backup_config(void) { LM_NOTICE("backup written to %s\n", backup_file); pkg_free(backup_file); return 0; +errclose: + /* close the files so that resource leak is prevented ; ignore errors*/ + fclose(from); + fclose(to); errout: pkg_free(backup_file); return -1;

14 years, 6 months

git:master: add new module "matrix" for array lookups

by Marius Ovidiu Bucur

Module: sip-router Branch: master Commit: 1fb1997b632b33b4f9195bb3b68111ca6a87d84b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1fb1997… Author: Marius Bucur <marius(a)dsl-core.(none)> Committer: Marius Bucur <marius(a)dsl-core.(none)> Date: Wed Aug 4 18:35:31 2010 +0200 add new module "matrix" for array lookups --- lib/srdb1/schema/kamailio-matrix.xml | 13 + lib/srdb1/schema/matrix.xml | 45 ++ modules/matrix/Makefile | 13 + modules/matrix/README | 313 +++++++++++ modules/matrix/db_matrix.c | 112 ++++ modules/matrix/db_matrix.h | 85 +++ modules/matrix/doc/Makefile | 4 + modules/matrix/doc/matrix.html | 874 +++++++++++++++++++++++++++++ modules/matrix/doc/matrix.txt | 313 +++++++++++ modules/matrix/doc/matrix.xml | 42 ++ modules/matrix/doc/matrix_admin.xml | 240 ++++++++ modules/matrix/doc/matrix_db.xml | 79 +++ modules/matrix/matrix.c | 621 ++++++++++++++++++++ utils/kamctl/db_berkeley/kamailio/version | 20 +- utils/kamctl/dbtext/kamailio/version | 10 +- utils/kamctl/mysql/matrix-create.sql | 9 + utils/kamctl/oracle/matrix-create.sql | 17 + utils/kamctl/postgres/matrix-create.sql | 9 + 18 files changed, 2813 insertions(+), 6 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1fb…

14 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev