diff --git a/modules/dialog/README b/modules/dialog/README index 7ef10fbaee..c91367b303 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -42,19 +42,19 @@ Vladut-Stefan Paiu 1.6.10. db_update_period (integer) 1.6.11. ping_interval (integer) 1.6.12. table_name (string) - 1.6.13. callid_column (string) + 1.6.13. call_id_column (string) 1.6.14. from_uri_column (string) 1.6.15. from_tag_column (string) 1.6.16. to_uri_column (string) 1.6.17. to_tag_column (string) - 1.6.18. caller_cseq_column (string) - 1.6.19. callee_cseq_column (string) - 1.6.20. caller_route_column (string) - 1.6.21. callee_route_column (string) - 1.6.22. caller_contact_column (string) - 1.6.23. callee_contact_column (string) - 1.6.24. caller_sock_column (string) - 1.6.25. callee_sock_column (string) + 1.6.18. from_cseq_column (string) + 1.6.19. to_cseq_column (string) + 1.6.20. from_route_column (string) + 1.6.21. to_route_column (string) + 1.6.22. from_contact_column (string) + 1.6.23. to_contact_column (string) + 1.6.24. from_sock_column (string) + 1.6.25. to_sock_column (string) 1.6.26. dlg_id_column (string) 1.6.27. state_column (string) 1.6.28. start_time_column (string) @@ -62,21 +62,23 @@ Vladut-Stefan Paiu 1.6.30. profiles_column (string) 1.6.31. vars_column (string) 1.6.32. sflags_column (string) - 1.6.33. profiles_with_value (string) - 1.6.34. profiles_no_value (string) - 1.6.35. db_flush_vals_profiles (int) - 1.6.36. timer_bulk_del_no (int) - 1.6.37. cachedb_url (string) - 1.6.38. profile_value_prefix (string) - 1.6.39. profile_no_value_prefix (string) - 1.6.40. profile_size_prefix (string) - 1.6.41. profile_timeout (int) - 1.6.42. accept_replicated_dialogs (int) - 1.6.43. replicate_dialogs_to (string) - 1.6.44. th_callid_passwd (string) - 1.6.45. th_callid_prefix (string) - 1.6.46. th_passed_contact_uri_params (string) - 1.6.47. th_passed_contact_params (string) + 1.6.33. mflags_column (string) + 1.6.34. flags_column (string) + 1.6.35. profiles_with_value (string) + 1.6.36. profiles_no_value (string) + 1.6.37. db_flush_vals_profiles (int) + 1.6.38. timer_bulk_del_no (int) + 1.6.39. cachedb_url (string) + 1.6.40. profile_value_prefix (string) + 1.6.41. profile_no_value_prefix (string) + 1.6.42. profile_size_prefix (string) + 1.6.43. profile_timeout (int) + 1.6.44. accept_replicated_dialogs (int) + 1.6.45. replicate_dialogs_to (string) + 1.6.46. th_callid_passwd (string) + 1.6.47. th_callid_prefix (string) + 1.6.48. th_passed_contact_uri_params (string) + 1.6.49. th_passed_contact_params (string) 1.7. Exported Functions @@ -163,19 +165,19 @@ Vladut-Stefan Paiu 1.10. Set db_update_period parameter 1.11. Set ping_interval parameter 1.12. Set table_name parameter - 1.13. Set callid_column parameter + 1.13. Set call_id_column parameter 1.14. Set from_uri_column parameter 1.15. Set from_tag_column parameter 1.16. Set to_uri_column parameter 1.17. Set to_tag_column parameter - 1.18. Set caller_cseq_column parameter - 1.19. Set callee_cseq_column parameter - 1.20. Set caller_route_column parameter + 1.18. Set from_cseq_column parameter + 1.19. Set to_cseq_column parameter + 1.20. Set from_route_column parameter 1.21. Set to_route_column parameter - 1.22. Set caller_contact_column parameter - 1.23. Set callee_contact_column parameter - 1.24. Set caller_sock_column parameter - 1.25. Set callee_sock_column parameter + 1.22. Set from_contact_column parameter + 1.23. Set to_contact_column parameter + 1.24. Set from_sock_column parameter + 1.25. Set to_sock_column parameter 1.26. Set dlg_id_column parameter 1.27. Set state_column parameter 1.28. Set start_time_column parameter @@ -183,38 +185,40 @@ Vladut-Stefan Paiu 1.30. Set profiles_column parameter 1.31. Set vars_column parameter 1.32. Set sflags_column parameter - 1.33. Set profiles_with_value parameter - 1.34. Set profiles_no_value parameter - 1.35. Set db_flush_vals_profiles parameter - 1.36. Set timer_bulk_del_no parameter - 1.37. Set cachedb_url parameter - 1.38. Set profile_value_prefix parameter - 1.39. Set profile_no_value_prefix parameter - 1.40. Set profile_size_prefix parameter - 1.41. Set profile_timeout parameter - 1.42. Set accept_replicated_dialogs parameter - 1.43. Set replicate_dialogs_to parameter - 1.44. Set th_callid_passwd parameter - 1.45. Set th_callid_prefix parameter - 1.46. Set th_passed_contact_uri_params parameter - 1.47. Set th_passed_contact_params parameter - 1.48. create_dialog() usage - 1.49. match_dialog() usage - 1.50. validate_dialog() usage - 1.51. fix_route_dialog() usage - 1.52. get_dialog_info usage - 1.53. set_dlg_profile usage - 1.54. unset_dlg_profile usage - 1.55. is_in_profile usage - 1.56. get_profile_size usage - 1.57. set_dlg_flag usage - 1.58. test_and_set_dlg_flag usage - 1.59. reset_dlg_flag usage - 1.60. is_dlg_flag_set usage - 1.61. store_dlg_value usage - 1.62. fetch_dlg_value usage - 1.63. topology_hiding usage - 1.64. calling match_dialog() function for topology hiding + 1.33. Set mflags_column parameter + 1.34. Set flags_column parameter + 1.35. Set profiles_with_value parameter + 1.36. Set profiles_no_value parameter + 1.37. Set db_flush_vals_profiles parameter + 1.38. Set timer_bulk_del_no parameter + 1.39. Set cachedb_url parameter + 1.40. Set profile_value_prefix parameter + 1.41. Set profile_no_value_prefix parameter + 1.42. Set profile_size_prefix parameter + 1.43. Set profile_timeout parameter + 1.44. Set accept_replicated_dialogs parameter + 1.45. Set replicate_dialogs_to parameter + 1.46. Set th_callid_passwd parameter + 1.47. Set th_callid_prefix parameter + 1.48. Set th_passed_contact_uri_params parameter + 1.49. Set th_passed_contact_params parameter + 1.50. create_dialog() usage + 1.51. match_dialog() usage + 1.52. validate_dialog() usage + 1.53. fix_route_dialog() usage + 1.54. get_dialog_info usage + 1.55. set_dlg_profile usage + 1.56. unset_dlg_profile usage + 1.57. is_in_profile usage + 1.58. get_profile_size usage + 1.59. set_dlg_flag usage + 1.60. test_and_set_dlg_flag usage + 1.61. reset_dlg_flag usage + 1.62. is_dlg_flag_set usage + 1.63. store_dlg_value usage + 1.64. fetch_dlg_value usage + 1.65. topology_hiding usage + 1.66. calling match_dialog() function for topology hiding sequential requests Chapter 1. Admin Guide @@ -498,15 +502,15 @@ modparam("dialog", "ping_interval", 20) modparam("dialog", "table_name", "my_dialog") ... -1.6.13. callid_column (string) +1.6.13. call_id_column (string) The column's name in the database to store the dialogs' callid. Default value is “callid”. - Example 1.13. Set callid_column parameter + Example 1.13. Set call_id_column parameter ... -modparam("dialog", "callid_column", "callid_c_name") +modparam("dialog", "call_id_column", "callid_c_name") ... 1.6.14. from_uri_column (string) @@ -557,43 +561,43 @@ modparam("dialog", "to_uri_column", "to_uri_c_name") modparam("dialog", "to_tag_column", "to_tag_c_name") ... -1.6.18. caller_cseq_column (string) +1.6.18. from_cseq_column (string) The column's name in the database to store the cseq from caller side. Default value is “caller_cseq”. - Example 1.18. Set caller_cseq_column parameter + Example 1.18. Set from_cseq_column parameter ... -modparam("dialog", "caller_cseq_column", "column_name") +modparam("dialog", "from_cseq_column", "from_cseq_c_name") ... -1.6.19. callee_cseq_column (string) +1.6.19. to_cseq_column (string) The column's name in the database to store the cseq from callee side. Default value is “callee_cseq”. - Example 1.19. Set callee_cseq_column parameter + Example 1.19. Set to_cseq_column parameter ... -modparam("dialog", "callee_cseq_column", "column_name") +modparam("dialog", "to_cseq_column", "to_cseq_c_name") ... -1.6.20. caller_route_column (string) +1.6.20. from_route_column (string) The column's name in the database to store the route records from caller side (proxy to caller). Default value is “caller_route_set”. - Example 1.20. Set caller_route_column parameter + Example 1.20. Set from_route_column parameter ... -modparam("dialog", "caller_route_column", "column_name") +modparam("dialog", "from_route_column", "from_route_c_name") ... -1.6.21. callee_route_column (string) +1.6.21. to_route_column (string) The column's name in the database to store the route records from callee side (proxy to callee). @@ -602,55 +606,55 @@ modparam("dialog", "caller_route_column", "column_name") Example 1.21. Set to_route_column parameter ... -modparam("dialog", "to_route_column", "column_name") +modparam("dialog", "to_route_column", "to_route_c_name") ... -1.6.22. caller_contact_column (string) +1.6.22. from_contact_column (string) The column's name in the database to store the caller's contact uri. - Default value is “from_contact”. + Default value is “caller_contact”. - Example 1.22. Set caller_contact_column parameter + Example 1.22. Set from_contact_column parameter ... -modparam("dialog", "caller_contact_column", "column_name") +modparam("dialog", "from_contact_column", "from_contact_c_name") ... -1.6.23. callee_contact_column (string) +1.6.23. to_contact_column (string) The column's name in the database to store the callee's contact uri. Default value is “callee_contact”. - Example 1.23. Set callee_contact_column parameter + Example 1.23. Set to_contact_column parameter ... -modparam("dialog", "callee_contact_column", "column_name") +modparam("dialog", "to_contact_column", "to_contact_c_name") ... -1.6.24. caller_sock_column (string) +1.6.24. from_sock_column (string) The column's name in the database to store the information about the local interface receiving the traffic from caller. Default value is “caller_sock”. - Example 1.24. Set caller_sock_column parameter + Example 1.24. Set from_sock_column parameter ... -modparam("dialog", "caller_sock_column", "column_name") +modparam("dialog", "from_sock_column", "from_sock_c_name") ... -1.6.25. callee_sock_column (string) +1.6.25. to_sock_column (string) The column's name in the database to store information about the local interface receiving the traffic from callee. - Default value is “callee_contact”. + Default value is “callee_sock”. - Example 1.25. Set callee_sock_column parameter + Example 1.25. Set to_sock_column parameter ... -modparam("dialog", "callee_sock_column", "column_name") +modparam("dialog", "to_sock_column", "to_sock_c_name") ... 1.6.26. dlg_id_column (string) @@ -736,30 +740,53 @@ modparam("dialog", "vars_column", "vars_c_name") modparam("dialog", "sflags_column", "sflags_c_name") ... -1.6.33. profiles_with_value (string) +1.6.33. mflags_column (string) + + The column's name in the database to store the dialogs' module + flags. + + Default value is “module_flags”. + + Example 1.33. Set mflags_column parameter +... +modparam("dialog", "mflags_column", "mflags_c_name") +... + +1.6.34. flags_column (string) + + The column's name in the database to store the dialogs' flags. + + Default value is “flags”. + + Example 1.34. Set flags_column parameter +... +modparam("dialog", "flags_column", "flags_c_name") +... + +1.6.35. profiles_with_value (string) List of names for profiles with values. Default value is “empty”. - Example 1.33. Set profiles_with_value parameter + Example 1.35. Set profiles_with_value parameter ... modparam("dialog", "profiles_with_value", "caller ; my_profile; share/s" ) ... -1.6.34. profiles_no_value (string) +1.6.36. profiles_no_value (string) List of names for profiles without values. Default value is “empty”. - Example 1.34. Set profiles_no_value parameter + Example 1.36. Set profiles_no_value parameter ... modparam("dialog", "profiles_no_value", "inbound ; outbound ; shared/s") ... -1.6.35. db_flush_vals_profiles (int) +1.6.37. db_flush_vals_profiles (int) Pushes dialog values, profiles and flags into the database along with other dialog state information (see db_mode 1 and @@ -767,36 +794,36 @@ modparam("dialog", "profiles_no_value", "inbound ; outbound ; shared/s") Default value is “empty”. - Example 1.35. Set db_flush_vals_profiles parameter + Example 1.37. Set db_flush_vals_profiles parameter ... modparam("dialog", "db_flush_vals_profiles", 1) ... -1.6.36. timer_bulk_del_no (int) +1.6.38. timer_bulk_del_no (int) The number of dialogs that should be attempted to be deleted at the same time ( a single query ) from the DB back-end. Default value is “1”. - Example 1.36. Set timer_bulk_del_no parameter + Example 1.38. Set timer_bulk_del_no parameter ... modparam("dialog", "timer_bulk_del_no", 10) ... -1.6.37. cachedb_url (string) +1.6.39. cachedb_url (string) Enables distributed dialog profiles and specifies the backend that should be used by the CacheDB interface. Default value is “empty”. - Example 1.37. Set cachedb_url parameter + Example 1.39. Set cachedb_url parameter ... modparam("dialog", "cachedb_url", "redis://127.0.0.1:6379") ... -1.6.38. profile_value_prefix (string) +1.6.40. profile_value_prefix (string) Specifies what prefix should be added to the profiles with value when they are inserted into CacheDB backed. This is only @@ -804,12 +831,12 @@ modparam("dialog", "cachedb_url", "redis://127.0.0.1:6379") Default value is “dlg_val_”. - Example 1.38. Set profile_value_prefix parameter + Example 1.40. Set profile_value_prefix parameter ... modparam("dialog", "profile_value_prefix", "dlgv_") ... -1.6.39. profile_no_value_prefix (string) +1.6.41. profile_no_value_prefix (string) Specifies what prefix should be added to the profiles without value when they are inserted into CacheDB backed. This is only @@ -817,12 +844,12 @@ modparam("dialog", "profile_value_prefix", "dlgv_") Default value is “dlg_noval_”. - Example 1.39. Set profile_no_value_prefix parameter + Example 1.41. Set profile_no_value_prefix parameter ... modparam("dialog", "profile_no_value_prefix", "dlgnv_") ... -1.6.40. profile_size_prefix (string) +1.6.42. profile_size_prefix (string) Specifies what prefix should be added to the entity that holds the profiles with value size in CacheDB backed. This is only @@ -830,12 +857,12 @@ modparam("dialog", "profile_no_value_prefix", "dlgnv_") Default value is “dlg_size_”. - Example 1.40. Set profile_size_prefix parameter + Example 1.42. Set profile_size_prefix parameter ... modparam("dialog", "profile_size_prefix", "dlgs_") ... -1.6.41. profile_timeout (int) +1.6.43. profile_timeout (int) Specifies how long a dialog profile should be kept in the CacheDB until it expires. This is only used when distributed @@ -843,24 +870,24 @@ modparam("dialog", "profile_size_prefix", "dlgs_") Default value is “86400”. - Example 1.41. Set profile_timeout parameter + Example 1.43. Set profile_timeout parameter ... modparam("dialog", "profile_timeout", "43200") ... -1.6.42. accept_replicated_dialogs (int) +1.6.44. accept_replicated_dialogs (int) Registers the dialog module to the OpenSIPS Binary Internal Interface. Default value is 0 (not registered). - Example 1.42. Set accept_replicated_dialogs parameter + Example 1.44. Set accept_replicated_dialogs parameter ... modparam("dialog", "accept_replicated_dialogs", 1) ... -1.6.43. replicate_dialogs_to (string) +1.6.45. replicate_dialogs_to (string) Adds a new dialog replication destination. The destination will receive all dialog-related events (creation, updating and @@ -868,24 +895,24 @@ modparam("dialog", "accept_replicated_dialogs", 1) Default value is “null” (no replication destinations). - Example 1.43. Set replicate_dialogs_to parameter + Example 1.45. Set replicate_dialogs_to parameter ... modparam("dialog", "replicate_dialogs_to", "10.0.0.150:5062") ... -1.6.44. th_callid_passwd (string) +1.6.46. th_callid_passwd (string) The string password that will be used for encoding/decoding the callid in case of topology_hiding with callid mangling. Default value is “"OpenSIPS"” - Example 1.44. Set th_callid_passwd parameter + Example 1.46. Set th_callid_passwd parameter ... modparam("dialog", "th_callid_passwd", "my_topo_hiding_secret") ... -1.6.45. th_callid_prefix (string) +1.6.47. th_callid_prefix (string) The prefix that will be used for detecting callids which have been encoded by the dialog topology hiding. Make sure to change @@ -894,12 +921,12 @@ modparam("dialog", "th_callid_passwd", "my_topo_hiding_secret") Default value is “"DLGCH_"” - Example 1.45. Set th_callid_prefix parameter + Example 1.47. Set th_callid_prefix parameter ... modparam("dialog", "th_callid_prefix", "MYCALLIDPREFIX_") ... -1.6.46. th_passed_contact_uri_params (string) +1.6.48. th_passed_contact_uri_params (string) List of semicolon-separated Contact URI parameters that will be passed from one side to the other for topology hiding calls. To @@ -908,13 +935,13 @@ modparam("dialog", "th_callid_prefix", "MYCALLIDPREFIX_") Default value is “empty” - do not pass any parameters - Example 1.46. Set th_passed_contact_uri_params parameter + Example 1.48. Set th_passed_contact_uri_params parameter ... modparam("dialog", "th_passed_contact_uri_params", "paramname1;myparam;c ustom_param") ... -1.6.47. th_passed_contact_params (string) +1.6.49. th_passed_contact_params (string) List of semicolon-separated Contact header parameters that will be passed from one side to the other for topology hiding calls. @@ -923,7 +950,7 @@ ustom_param") Default value is “empty” - do not pass any parameters - Example 1.47. Set th_passed_contact_params parameter + Example 1.49. Set th_passed_contact_params parameter ... modparam("dialog", "th_passed_contact_params", "paramname1;myparam;custo m_param") @@ -949,7 +976,7 @@ m_param") This function can be used from REQUEST_ROUTE. - Example 1.48. create_dialog() usage + Example 1.50. create_dialog() usage ... create_dialog(); ... @@ -984,7 +1011,7 @@ create_dialog("B"); This function can be used from REQUEST_ROUTE. - Example 1.49. match_dialog() usage + Example 1.51. match_dialog() usage ... if (has_totag()) { loose_route(); @@ -1014,7 +1041,7 @@ create_dialog("B"); This function can be used from REQUEST_ROUTE. - Example 1.50. validate_dialog() usage + Example 1.52. validate_dialog() usage ... if (has_totag()) { loose_route(); @@ -1036,7 +1063,7 @@ create_dialog("B"); This function can be used from REQUEST_ROUTE. - Example 1.51. fix_route_dialog() usage + Example 1.53. fix_route_dialog() usage ... if (has_totag()) { loose_route(); @@ -1074,7 +1101,7 @@ create_dialog("B"); This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE, FAILURE_ROUTE and LOCAL_ROUTE. - Example 1.52. get_dialog_info usage + Example 1.54. get_dialog_info usage ... if ( get_dialog_info("callee","$var(x)","caller","$fu") ) { xlog("caller $fU has another ongoing, talking to callee $var(x)\ @@ -1107,7 +1134,7 @@ $dlg_val(callee) = $ru; This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.53. set_dlg_profile usage + Example 1.55. set_dlg_profile usage ... set_dlg_profile("inbound_call"); set_dlg_profile("caller","$fu"); @@ -1129,7 +1156,7 @@ set_dlg_profile("caller","$fu"); This function can be used from BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.54. unset_dlg_profile usage + Example 1.56. unset_dlg_profile usage ... unset_dlg_profile("inbound_call"); unset_dlg_profile("caller","$fu"); @@ -1156,7 +1183,7 @@ unset_dlg_profile("caller","$fu"); This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.55. is_in_profile usage + Example 1.57. is_in_profile usage ... if (is_in_profile("inbound_call")) { log("this request belongs to a inbound call\n"); @@ -1187,7 +1214,7 @@ if (is_in_profile("caller","XX")) { This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.56. get_profile_size usage + Example 1.58. get_profile_size usage ... get_profile_size("inbound_call","$avp(size)"); xlog("currently there are $avp(size) inbound calls\n"); @@ -1210,7 +1237,7 @@ xlog("currently, the user %fu has $avp(size) active outgoing calls\n"); This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.57. set_dlg_flag usage + Example 1.59. set_dlg_flag usage ... set_dlg_flag("3"); ... @@ -1231,7 +1258,7 @@ set_dlg_flag("3"); This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.58. test_and_set_dlg_flag usage + Example 1.60. test_and_set_dlg_flag usage ... test_and_set_dlg_flag("3", "0"); ... @@ -1250,7 +1277,7 @@ test_and_set_dlg_flag("3", "0"); This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.59. reset_dlg_flag usage + Example 1.61. reset_dlg_flag usage ... reset_dlg_flag("16"); ... @@ -1269,7 +1296,7 @@ reset_dlg_flag("16"); This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.60. is_dlg_flag_set usage + Example 1.62. is_dlg_flag_set usage ... if (is_dlg_flag_set("16")) { xlog("dialog flag 16 is set\n"); @@ -1294,7 +1321,7 @@ if (is_dlg_flag_set("16")) { This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.61. store_dlg_value usage + Example 1.63. store_dlg_value usage ... store_dlg_value("inv_src_ip","$si"); store_dlg_value("account type","prepaid"); @@ -1320,7 +1347,7 @@ $dlg_val(account_type) = "prepaid"; This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.62. fetch_dlg_value usage + Example 1.64. fetch_dlg_value usage ... fetch_dlg_value("inv_src_ip","$avp(2)"); fetch_dlg_value("account type","$var(account)"); @@ -1373,7 +1400,7 @@ $var(account) = $dlg_val(account_type); value for the caller side. If the callid for the callee side is needed, refer to the $DLG_callee_callid pvar. - Example 1.63. topology_hiding usage + Example 1.65. topology_hiding usage ... if(!has_totag() && is_method("INVITE")) { topology_hiding(); @@ -1385,7 +1412,7 @@ if(!has_totag() && is_method("INVITE")) { } ... - Example 1.64. calling match_dialog() function for topology + Example 1.66. calling match_dialog() function for topology hiding sequential requests ... if (has_totag() && (uri == myself) && is_method("INVITE|ACK|BYE|UPDATE diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 89a53ce4c1..71fc64ddac 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -264,6 +264,7 @@ static param_export_t mod_params[]={ { "vars_column", STR_PARAM, &vars_column.s }, { "sflags_column", STR_PARAM, &sflags_column.s }, { "mflags_column", STR_PARAM, &mflags_column.s }, + { "flags_column", STR_PARAM, &flags_column.s }, { "db_update_period", INT_PARAM, &db_update_period }, { "profiles_with_value", STR_PARAM, &profiles_wv_s }, { "profiles_no_value", STR_PARAM, &profiles_nv_s }, @@ -704,6 +705,7 @@ static int mod_init(void) vars_column.len = strlen(vars_column.s); sflags_column.len = strlen(sflags_column.s); mflags_column.len = strlen(mflags_column.s); + flags_column.len = strlen(flags_column.s); dialog_table_name.len = strlen(dialog_table_name.s); topo_hiding_prefix.len = strlen(topo_hiding_prefix.s); topo_hiding_seed.len = strlen(topo_hiding_seed.s); diff --git a/modules/dialog/dlg_db_handler.h b/modules/dialog/dlg_db_handler.h index d477762043..bde315a469 100644 --- a/modules/dialog/dlg_db_handler.h +++ b/modules/dialog/dlg_db_handler.h @@ -96,6 +96,7 @@ extern str profiles_column; extern str vars_column; extern str sflags_column; extern str mflags_column; +extern str flags_column; extern str th_column; extern str dialog_table_name; extern int dlg_db_mode; diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index afa903e927..dbbc09e1d4 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -461,7 +461,7 @@ modparam("dialog", "table_name", "my_dialog")
- <varname>callid_column</varname> (string) + <varname>call_id_column</varname> (string) The column's name in the database to store the dialogs' callid. @@ -471,10 +471,10 @@ modparam("dialog", "table_name", "my_dialog") - Set <varname>callid_column</varname> parameter + Set <varname>call_id_column</varname> parameter ... -modparam("dialog", "callid_column", "callid_c_name") +modparam("dialog", "call_id_column", "callid_c_name") ... @@ -565,7 +565,7 @@ modparam("dialog", "to_tag_column", "to_tag_c_name")
- <varname>caller_cseq_column</varname> (string) + <varname>from_cseq_column</varname> (string) The column's name in the database to store the cseq from caller side. @@ -576,17 +576,17 @@ modparam("dialog", "to_tag_column", "to_tag_c_name") - Set <varname>caller_cseq_column</varname> parameter + Set <varname>from_cseq_column</varname> parameter ... -modparam("dialog", "caller_cseq_column", "column_name") +modparam("dialog", "from_cseq_column", "from_cseq_c_name") ...
- <varname>callee_cseq_column</varname> (string) + <varname>to_cseq_column</varname> (string) The column's name in the database to store the cseq from callee side. @@ -597,17 +597,17 @@ modparam("dialog", "caller_cseq_column", "column_name") - Set <varname>callee_cseq_column</varname> parameter + Set <varname>to_cseq_column</varname> parameter ... -modparam("dialog", "callee_cseq_column", "column_name") +modparam("dialog", "to_cseq_column", "to_cseq_c_name") ...
- <varname>caller_route_column</varname> (string) + <varname>from_route_column</varname> (string) The column's name in the database to store the route records from caller side (proxy to caller). @@ -618,17 +618,17 @@ modparam("dialog", "callee_cseq_column", "column_name") - Set <varname>caller_route_column</varname> parameter + Set <varname>from_route_column</varname> parameter ... -modparam("dialog", "caller_route_column", "column_name") +modparam("dialog", "from_route_column", "from_route_c_name") ...
- <varname>callee_route_column</varname> (string) + <varname>to_route_column</varname> (string) The column's name in the database to store the route records from callee side (proxy to callee). @@ -642,35 +642,35 @@ modparam("dialog", "caller_route_column", "column_name") Set <varname>to_route_column</varname> parameter ... -modparam("dialog", "to_route_column", "column_name") +modparam("dialog", "to_route_column", "to_route_c_name") ...
- <varname>caller_contact_column</varname> (string) + <varname>from_contact_column</varname> (string) The column's name in the database to store the caller's contact uri. - Default value is from_contact. + Default value is caller_contact. - Set <varname>caller_contact_column</varname> parameter + Set <varname>from_contact_column</varname> parameter ... -modparam("dialog", "caller_contact_column", "column_name") +modparam("dialog", "from_contact_column", "from_contact_c_name") ...
- <varname>callee_contact_column</varname> (string) + <varname>to_contact_column</varname> (string) The column's name in the database to store the callee's contact uri. @@ -681,17 +681,17 @@ modparam("dialog", "caller_contact_column", "column_name") - Set <varname>callee_contact_column</varname> parameter + Set <varname>to_contact_column</varname> parameter ... -modparam("dialog", "callee_contact_column", "column_name") +modparam("dialog", "to_contact_column", "to_contact_c_name") ...
- <varname>caller_sock_column</varname> (string) + <varname>from_sock_column</varname> (string) The column's name in the database to store the information about the local interface receiving the traffic from caller. @@ -702,31 +702,31 @@ modparam("dialog", "callee_contact_column", "column_name") - Set <varname>caller_sock_column</varname> parameter + Set <varname>from_sock_column</varname> parameter ... -modparam("dialog", "caller_sock_column", "column_name") +modparam("dialog", "from_sock_column", "from_sock_c_name") ...
- <varname>callee_sock_column</varname> (string) + <varname>to_sock_column</varname> (string) The column's name in the database to store information about the local interface receiving the traffic from callee. - Default value is callee_contact. + Default value is callee_sock. - Set <varname>callee_sock_column</varname> parameter + Set <varname>to_sock_column</varname> parameter ... -modparam("dialog", "callee_sock_column", "column_name") +modparam("dialog", "to_sock_column", "to_sock_c_name") ... @@ -875,6 +875,46 @@ modparam("dialog", "sflags_column", "sflags_c_name")
+
+ <varname>mflags_column</varname> (string) + + The column's name in the database to store the dialogs' module flags. + + + + Default value is module_flags. + + + + Set <varname>mflags_column</varname> parameter + +... +modparam("dialog", "mflags_column", "mflags_c_name") +... + + +
+ +
+ <varname>flags_column</varname> (string) + + The column's name in the database to store the dialogs' flags. + + + + Default value is flags. + + + + Set <varname>flags_column</varname> parameter + +... +modparam("dialog", "flags_column", "flags_c_name") +... + + +
+
<varname>profiles_with_value</varname> (string)