[sr-dev] git:master:2d6d34b2: modules/dialog_ng: corrected PARAM_STRING to PARAM_STR

Module: kamailio Branch: master Commit: 2d6d34b21320b269c6eceb5a44c5c91eb44740fc URL: https://github.com/kamailio/kamailio/commit/2d6d34b21320b269c6eceb5a44c5c91… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: 2015-02-13T09:45:16+02:00 modules/dialog_ng: corrected PARAM_STRING to PARAM_STR --- Modified: modules/dialog_ng/dialog.c Modified: modules/dialog_ng/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/2d6d34b21320b269c6eceb5a44c5c91… Patch: https://github.com/kamailio/kamailio/commit/2d6d34b21320b269c6eceb5a44c5c91… --- diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index f9a5031..1724a60 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -126,7 +126,7 @@ static cmd_export_t cmds[] = { static param_export_t mod_params[] = { { "hash_size", INT_PARAM, &dlg_hash_size}, - { "rr_param", PARAM_STRING, &rr_param}, + { "rr_param", PARAM_STR, &rr_param}, { "dlg_flag", INT_PARAM, &dlg_flag}, { "timeout_avp", PARAM_STR, &timeout_spec}, { "default_timeout", INT_PARAM, &default_timeout}, @@ -134,14 +134,14 @@ static param_export_t mod_params[] = { //In this new dialog module we always match using DID //{ "dlg_match_mode", INT_PARAM, &seq_match_mode}, - { "db_url", PARAM_STRING, &db_url }, + { "db_url", PARAM_STR, &db_url }, { "db_mode", INT_PARAM, &dlg_db_mode_param }, { "db_update_period", INT_PARAM, &db_update_period }, { "db_fetch_rows", INT_PARAM, &db_fetch_rows } , { "detect_spirals", INT_PARAM, &detect_spirals }, - { "profiles_with_value",PARAM_STRING, &profiles_wv_s }, - { "profiles_no_value", PARAM_STRING, &profiles_nv_s }, + { "profiles_with_value",PARAM_STR, &profiles_wv_s }, + { "profiles_no_value", PARAM_STR, &profiles_nv_s }, { "bridge_controller", PARAM_STR, &dlg_bridge_controller }, { "ruri_pvar", PARAM_STR, &ruri_pvar_param }, diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index 01d3cd4..f484830 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -555,8 +555,10 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { } else { ref_dlg(dlg, 1); } - - counter_add(dialog_ng_cnts_h.early, -1); + + if (old_state == DLG_STATE_EARLY) + counter_add(dialog_ng_cnts_h.early, -1); + counter_inc(dialog_ng_cnts_h.active); run_dlg_callbacks(DLGCB_CONFIRMED, dlg, req, rpl, DLG_DIR_UPSTREAM, 0);