May 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r13462 - freeswitch/trunk/build
by FreeSWITCH SVN 27 May '09

27 May '09

Author: mikej Date: Wed May 27 00:18:57 2009 New Revision: 13462 Log: add to build template Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Wed May 27 00:18:57 2009 @@ -15,6 +15,7 @@ applications/mod_esf #applications/mod_easyroute applications/mod_fsv +#applications/mod_nibblebill #applications/mod_soundtouch #applications/mod_rss #applications/mod_snom

1 0

[Freeswitch-svn] [commit] r13461 - in freeswitch/trunk: conf src
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Wed May 27 00:07:19 2009 New Revision: 13461 Log: zrtp_secure_media=true will have to be set to true in order for your zrtp to work moving forward similar to how srtp_secure_media works. Modified: freeswitch/trunk/conf/vars.xml freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed May 27 00:07:19 2009 @@ -26,6 +26,9 @@ <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/> <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/> + +  + <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/> <!-- xmpp_client_profile and xmpp_server_profile xmpp_client_profile can be any string. Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed May 27 00:07:19 2009 @@ -1107,35 +1107,38 @@ int initiator = 0; switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session"); switch_channel_t *channel = switch_core_session_get_channel(session); + const char *zrtp_enabled = switch_channel_get_variable(channel, "zrtp_secure_media"); - if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { - initiator = 1; - } - - rtp_session->zrtp_profile = switch_core_alloc(rtp_session->pool, sizeof(*rtp_session->zrtp_profile)); - zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global); - - rtp_session->zrtp_profile->allowclear = 0; - rtp_session->zrtp_profile->disclose_bit = 0; - rtp_session->zrtp_profile->cache_ttl = -1; - - if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, initiator, &rtp_session->zrtp_session)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n"); - zrtp_session_down(rtp_session->zrtp_session); - rtp_session->zrtp_session = NULL; - } - - zrtp_session_set_userdata(rtp_session->zrtp_session, rtp_session); - - if (zrtp_status_ok != zrtp_stream_attach(rtp_session->zrtp_session, &rtp_session->zrtp_ctx)) { - abort(); - } - zrtp_stream_set_userdata(rtp_session->zrtp_ctx, rtp_session); - - if (switch_true(switch_channel_get_variable(channel, "zrtp_enrollment"))) { - zrtp_stream_registration_start(rtp_session->zrtp_ctx, rtp_session->ssrc); - } else { - zrtp_stream_start(rtp_session->zrtp_ctx, rtp_session->ssrc); + if (switch_true(zrtp_enabled)) { + if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { + initiator = 1; + } + + rtp_session->zrtp_profile = switch_core_alloc(rtp_session->pool, sizeof(*rtp_session->zrtp_profile)); + zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global); + + rtp_session->zrtp_profile->allowclear = 0; + rtp_session->zrtp_profile->disclose_bit = 0; + rtp_session->zrtp_profile->cache_ttl = -1; + + if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, initiator, &rtp_session->zrtp_session)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n"); + zrtp_session_down(rtp_session->zrtp_session); + rtp_session->zrtp_session = NULL; + } + + zrtp_session_set_userdata(rtp_session->zrtp_session, rtp_session); + + if (zrtp_status_ok != zrtp_stream_attach(rtp_session->zrtp_session, &rtp_session->zrtp_ctx)) { + abort(); + } + zrtp_stream_set_userdata(rtp_session->zrtp_ctx, rtp_session); + + if (switch_true(switch_channel_get_variable(channel, "zrtp_enrollment"))) { + zrtp_stream_registration_start(rtp_session->zrtp_ctx, rtp_session->ssrc); + } else { + zrtp_stream_start(rtp_session->zrtp_ctx, rtp_session->ssrc); + } } } #endif

1 0

[Freeswitch-svn] [commit] r13460 - freeswitch/trunk/src/mod/applications/mod_nibblebill
by FreeSWITCH SVN 27 May '09

27 May '09

Author: dschreiber Date: Wed May 27 00:00:24 2009 New Revision: 13460 Log: Removed another todo Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Wed May 27 00:00:24 2009 @@ -347,7 +347,7 @@ if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, nibblebill_callback, &pdata) != SWITCH_ODBC_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", sql); #endif - /* TODO: Return -1 for safety */ + /* Return -1 for safety */ return -1.00; #ifdef SWITCH_HAVE_ODBC

1 0

[Freeswitch-svn] [commit] r13459 - freeswitch/trunk/src/mod/applications/mod_nibblebill
by FreeSWITCH SVN 27 May '09

27 May '09

Author: dschreiber Date: Tue May 26 23:58:40 2009 New Revision: 13459 Log: Removed todo that is now done Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Tue May 26 23:58:40 2009 @@ -42,7 +42,6 @@ * * TODO: Fix what happens when the DB is not available * TODO: Fix what happens when the DB queries fail (right now, all are acting like success) - * TODO: Make the actions function for when funds are depleted * TODO: Add buffering abilities * TODO: Make error handling for database, such that when the database is down (or not installed) we just log to a text file * FUTURE: Possibly make the hooks not tied per-channel, and instead just do this as a supervision style application with one thread that watches all calls

1 0

[Freeswitch-svn] [commit] r13458 - in freeswitch/trunk: . conf/autoload_configs src/mod/applications/mod_nibblebill
by FreeSWITCH SVN 27 May '09

27 May '09

Author: mikej Date: Tue May 26 23:50:59 2009 New Revision: 13458 Log: add mod_nibblebill Added: freeswitch/trunk/conf/autoload_configs/nibblebill.conf.xml freeswitch/trunk/src/mod/applications/mod_nibblebill/ (props changed) freeswitch/trunk/src/mod/applications/mod_nibblebill/Makefile freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.2008.vcproj freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/Freeswitch.2008.sln Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Tue May 26 23:50:59 2009 @@ -1018,6 +1018,11 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_nibblebill", "src\mod\applications\mod_nibblebill\mod_nibblebill.2008.vcproj", "{3C977801-FE88-48F2-83D3-FA2EBFF6688E}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -2474,6 +2479,17 @@ {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.Build.0 = Release|Win32 {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.ActiveCfg = Release|x64 {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.Build.0 = Release|x64 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|Win32.ActiveCfg = Release|x64 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|x64.ActiveCfg = Release|x64 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.All|x64.Build.0 = Release|x64 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|Win32.ActiveCfg = Debug|Win32 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|Win32.Build.0 = Debug|Win32 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|x64.ActiveCfg = Debug|x64 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Debug|x64.Build.0 = Debug|x64 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|Win32.ActiveCfg = Release|Win32 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|Win32.Build.0 = Release|Win32 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|x64.ActiveCfg = Release|x64 + {3C977801-FE88-48F2-83D3-FA2EBFF6688E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2511,6 +2527,7 @@ {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {7877EFC8-4807-484B-B573-D7B7FD058FAA} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {3C977801-FE88-48F2-83D3-FA2EBFF6688E} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} Added: freeswitch/trunk/conf/autoload_configs/nibblebill.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/autoload_configs/nibblebill.conf.xml Tue May 26 23:50:59 2009 @@ -0,0 +1,36 @@ +<configuration name="nibblebill.conf" description="Nibble Billing"> + <settings> +  + +  + <param name="db_username" value="bandwidth.com"/> + <param name="db_password" value="password"/> + <param name="db_dsn" value="bandwidth.com"/> + +  + <param name="db_table" value="accounts"/> + +  + <param name="db_column_cash" value="cash"/> + +  + <param name="db_column_account" value="id"/> + + +  + <param name="global_heartbeat" value="60"/> + +  + <param name="lowbal_amt" value="5"/> + <param name="lowbal_action" value="play ding"/> + +  + <param name="nobal_amt" value="0"/> + <param name="nobal_action" value="hangup"/> + +  + <param name="percall_max_amt" value="100"/> + <param name="percall_action" value="hangup"/> + + </settings> +</configuration> Added: freeswitch/trunk/src/mod/applications/mod_nibblebill/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/Makefile Tue May 26 23:50:59 2009 @@ -0,0 +1,3 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules +LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;` Added: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.2008.vcproj Tue May 26 23:50:59 2009 @@ -0,0 +1,283 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_nibblebill" + ProjectGUID="{3C977801-FE88-48F2-83D3-FA2EBFF6688E}" + RootNamespace="mod_nibblebill" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_nibblebill.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Tue May 26 23:50:59 2009 @@ -0,0 +1,888 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * The Initial Developer of this module is + * Darren Schreiber <d(a)d-man.org> + * + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Darren Schreiber <d(a)d-man.org> + * + * mod_nibblebill.c - Nibble Billing + * Purpose is to allow real-time debiting of credit or cash from a database while calls are in progress. I had the following goals: + * + * Debit credit/cash from accounts real-time + * Allow for billing at different rates during a single call + * Allow for warning callers when their balance is low (via audio, in-channel) + * Allow for disconnecting or re-routing calls when balance is depleted + * Allow for billing to function as listed above with multiple concurrent calls + * + * Thanks go to bandwidth.com for funding this work. + * + * + * TODO: Fix what happens when the DB is not available + * TODO: Fix what happens when the DB queries fail (right now, all are acting like success) + * TODO: Make the actions function for when funds are depleted + * TODO: Add buffering abilities + * TODO: Make error handling for database, such that when the database is down (or not installed) we just log to a text file + * FUTURE: Possibly make the hooks not tied per-channel, and instead just do this as a supervision style application with one thread that watches all calls + */ + +#include <switch.h> + +#ifdef SWITCH_HAVE_ODBC +#include <switch_odbc.h> +#endif + +/* Defaults */ +#ifdef SWITCH_HAVE_ODBC +static char SQL_LOOKUP[] = "SELECT %s FROM %s WHERE %s='%s'"; +static char SQL_SAVE[] = "UPDATE %s SET %s=%s-%f WHERE %s='%s'"; +#endif + +typedef struct +{ + switch_time_t lastts; /* Last time we did any billing */ + float total; /* Total amount billed so far */ + + switch_time_t pausets; /* Timestamp of when a pause action started. 0 if not paused */ + float bill_adjustments; /* Adjustments to make to the next billing, based on pause/resume events */ + +} nibble_data_t; + + +typedef struct nibblebill_results +{ + float balance; + + float percall_max; /* Overrides global on a per-user level */ + float lowbal_amt; /* ditto */ +} nibblebill_results_t; + + +/* Keep track of our config, event hooks and database connection variables, for this module only */ +static struct +{ + /* Memory */ + switch_memory_pool_t *pool; + + /* Event hooks */ + switch_event_node_t *node; + + /* Global mutex (don't touch a session when it's already being touched) */ + switch_mutex_t *mutex; + + /* Global billing config options */ + float percall_max_amt; /* Per-call billing limit (safety check, for fraud) */ + char *percall_action; /* Exceeded length of per-call action */ + float lowbal_amt; /* When we warn them they are near depletion */ + char *lowbal_action; /* Low balance action */ + float nobal_amt; /* Minimum amount that must remain in the account */ + char *nobal_action; /* Drop action */ + + /* Other options */ + int global_heartbeat; /* Supervise and bill every X seconds, 0 means off */ + + /* Database settings */ + char *db_username; + char *db_password; + char *db_dsn; + char *db_table; + char *db_column_cash; + char *db_column_account; +#ifdef SWITCH_HAVE_ODBC + switch_odbc_handle_t *master_odbc; +#else + void *padding1; /* Keep structures same size */ +#endif +} globals; + +static void nibblebill_pause(switch_core_session_t *session); + +/************************** +* Setup FreeSWITCH Macros * +**************************/ +/* Define the module's load function */ +SWITCH_MODULE_LOAD_FUNCTION(mod_nibblebill_load); + +/* Define the module's shutdown function */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_nibblebill_shutdown); + +/* Define the module's name, load function, shutdown function and runtime function */ +SWITCH_MODULE_DEFINITION(mod_nibblebill, mod_nibblebill_load, mod_nibblebill_shutdown, NULL); + +/* String setting functions */ +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_username, globals.db_username); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_password, globals.db_password); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_dsn, globals.db_dsn); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_table, globals.db_table); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_column_cash, globals.db_column_cash); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_column_account, globals.db_column_account); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_percall_action, globals.percall_action); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_lowbal_action, globals.lowbal_action); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_nobal_action, globals.nobal_action); + +#ifdef SWITCH_HAVE_ODBC +static int nibblebill_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + nibblebill_results_t *cbt = (nibblebill_results_t *) pArg; + + cbt->balance = (float)atof(argv[0]); + + return 0; +} +#endif + +static switch_status_t load_config(void) +{ + char *cf = "nibblebill.conf"; + switch_xml_t cfg, xml = NULL, param, settings; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + status = SWITCH_STATUS_SUCCESS; /* We don't fail because we can still write to a text file or buffer */ + goto setdefaults; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "db_username")) { + set_global_db_username(val); + } else if (!strcasecmp(var, "db_password")) { + set_global_db_password(val); + } else if (!strcasecmp(var, "db_dsn")) { + set_global_db_dsn(val); + } else if (!strcasecmp(var, "db_table")) { + set_global_db_table(val); + } else if (!strcasecmp(var, "db_column_cash")) { + set_global_db_column_cash(val); + } else if (!strcasecmp(var, "db_column_account")) { + set_global_db_column_account(val); + } else if (!strcasecmp(var, "percall_action")) { + set_global_percall_action(val); + } else if (!strcasecmp(var, "percall_max_amt")) { + globals.percall_max_amt = (float)atof(val); + } else if (!strcasecmp(var, "lowbal_action")) { + set_global_lowbal_action(val); + } else if (!strcasecmp(var, "lowbal_amt")) { + globals.lowbal_amt = (float)atof(val); + } else if (!strcasecmp(var, "nobal_action")) { + set_global_nobal_action(val); + } else if (!strcasecmp(var, "nobal_amt")) { + globals.nobal_amt = (float)atof(val); + } else if (!strcasecmp(var, "global_heartbeat")) { + globals.global_heartbeat = atoi(val); + } + } + } + +/* Set defaults for any variables still not set */ +setdefaults: + if (switch_strlen_zero(globals.db_username)) { + set_global_db_username("bandwidth.com"); + } + if (switch_strlen_zero(globals.db_password)) { + set_global_db_password("dev"); + } + if (switch_strlen_zero(globals.db_dsn)) { + set_global_db_dsn("bandwidth.com"); + } + if (switch_strlen_zero(globals.percall_action)) { + set_global_percall_action("hangup"); + } + if (switch_strlen_zero(globals.lowbal_action)) { + set_global_lowbal_action("play ding"); + } + if (switch_strlen_zero(globals.nobal_action)) { + set_global_nobal_action("hangup"); + } + +#ifdef SWITCH_HAVE_ODBC + if (globals.db_dsn) { + if (!(globals.master_odbc = switch_odbc_handle_new(globals.db_dsn, globals.db_username, globals.db_password))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot create handle to ODBC Database!\n"); + status = SWITCH_STATUS_FALSE; + goto done; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opened ODBC Database handle!\n"); + } + + if (switch_odbc_handle_connect(globals.master_odbc) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot connect to ODBC driver/database %s (user: %s / pass %s)!\n", globals.db_dsn, globals.db_username, globals.db_password); + status = SWITCH_STATUS_FALSE; + goto done; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opened ODBC Database!\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.db_dsn); + } else { +#endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "ODBC does not appear to be installed in the core. You need to run ./configure --enable-core-odbc-support\n"); +#ifdef SWITCH_HAVE_ODBC + } +#endif + +#ifdef SWITCH_HAVE_ODBC +done: +#endif + + if (xml) { + switch_xml_free(xml); + } + return status; +} + +void debug_event_handler(switch_event_t *event) +{ + switch_event_header_t *event_header = NULL; + + if (!event) { + return; + } + + /* Print out all event headers, for fun */ + if (event->headers) { + for (event_header = event->headers; event_header; event_header = event_header->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Header info: %s => %s\n", event_header->name, event_header->value); + } + } +} + + +static void transfer_call(switch_core_session_t *session, char *destination) +{ + char *argv[4] = { 0 }; + const char *uuid; + switch_channel_t *channel = switch_core_session_get_channel(session); + + /* TODO: dup dest first */ + switch_separate_string(destination, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + /* Find the uuid of our B leg. If it exists, transfer it first */ + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + switch_core_session_t *b_session; + + /* Get info on the B leg */ + if ((b_session = switch_core_session_locate(uuid))) { + /* Make sure we are in the media path on B leg */ + switch_ivr_media(uuid, SMF_REBRIDGE); + + /* Transfer the B leg */ + switch_ivr_session_transfer(b_session, argv[0], argv[1], argv[2]); + switch_core_session_rwunlock(b_session); + } + } + + /* Make sure we are in the media path on A leg */ + uuid = switch_core_session_get_uuid(session); + switch_ivr_media(uuid, SMF_REBRIDGE); + + /* Transfer the A leg */ + switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); +} + + +/* At this time, billing never succeeds if you don't have a database. */ +static switch_status_t bill_event(float billamount, const char *billaccount) +{ +#ifdef SWITCH_HAVE_ODBC + char sql[1024] = ""; + SQLHSTMT stmt; + + snprintf(sql, 1024, SQL_SAVE, globals.db_table, globals.db_column_cash, globals.db_column_cash, billamount, globals.db_column_account, billaccount); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing update query\n[%s]\n", sql); + + if (switch_odbc_handle_exec(globals.master_odbc, sql, &stmt) != SWITCH_ODBC_SUCCESS) { + char *err_str; + err_str = switch_odbc_handle_get_error(globals.master_odbc, stmt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERR: [%s]\n[%s]\n", sql, switch_str_nil(err_str)); + switch_safe_free(err_str); + } else { +#endif + /* TODO: Failover to a flat/text file if DB is unavailable */ + + return SWITCH_STATUS_SUCCESS; +#ifdef SWITCH_HAVE_ODBC + } + + SQLFreeHandle(SQL_HANDLE_STMT, stmt); +#endif + return SWITCH_STATUS_SUCCESS; +} + + +static float get_balance(const char *billaccount) +{ +#ifdef SWITCH_HAVE_ODBC + char sql[1024] = ""; + nibblebill_results_t pdata; + float balance = 0.00; + + memset(&pdata, 0, sizeof(pdata)); + snprintf(sql, 1024, SQL_LOOKUP, globals.db_column_cash, globals.db_table, globals.db_column_account, billaccount); + + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, nibblebill_callback, &pdata) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", sql); +#endif + /* TODO: Return -1 for safety */ + + return -1.00; +#ifdef SWITCH_HAVE_ODBC + } else { + /* Successfully retrieved! */ + balance = pdata.balance; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Retrieved current balance for account %s (balance = %f)\n", billaccount, balance); + } + +#endif + return balance; +} + +/* This is where we actually charge the guy + This can be called anytime a call is in progress or at the end of a call before the session is destroyed */ +static switch_status_t do_billing(switch_core_session_t *session) +{ + /* FS vars we will use */ + switch_channel_t *channel; + switch_caller_profile_t *profile; + + /* Local vars */ + nibble_data_t *nibble_data; + switch_time_t ts = switch_micro_time_now(); + float billamount; + char date[80] = ""; + char *tmp; + char *uuid; + switch_size_t retsize; + switch_time_exp_t tm; + const char *billrate; + const char *billaccount; + + if (!session) { + /* Why are we here? */ + return SWITCH_STATUS_SUCCESS; + } + + uuid = switch_core_session_get_uuid(session); + + /* Get channel var */ + if (!(channel = switch_core_session_get_channel(session))) { + return SWITCH_STATUS_SUCCESS; + } + + /* Variables kept in FS but relevant only to this module */ + billrate = switch_channel_get_variable(channel, "nibble_rate"); + billaccount = switch_channel_get_variable(channel, "nibble_account"); + + /* Return if there's no billing information on this session */ + if (!billrate || !billaccount) { + return SWITCH_STATUS_SUCCESS; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to bill at $%s per minute to account %s\n", billrate, billaccount); + + /* Get caller profile info from channel */ + profile = switch_channel_get_caller_profile(channel); + + if (!profile) { + /* No caller profile (why would this happen?) */ + return SWITCH_STATUS_SUCCESS; + } + + if (profile->times->answered < 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not billing %s - call is not in answered state\n", billaccount); + return SWITCH_STATUS_SUCCESS; + } + + /* Lock this session's data for this module while we tinker with it */ + if (globals.mutex) { + switch_mutex_lock(globals.mutex); + } + + /* Get our nibble data var. This will be NULL if it's our first call here for this session */ + nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_"); + + /* Are we in paused mode? If so, we don't do anything here - go back! */ + if (nibble_data && (nibble_data->pausets > 0)) { + if (globals.mutex) { + switch_mutex_unlock(globals.mutex); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received heartbeat, but we're paused - ignoring\n"); + return SWITCH_STATUS_SUCCESS; + } + + /* Have we done any billing on this channel yet? If no, set up vars for doing so */ + if (!nibble_data) { + nibble_data = switch_core_session_alloc(session, sizeof(*nibble_data)); + if (!nibble_data) { + switch_assert(nibble_data); + } + memset(nibble_data, 0, sizeof(*nibble_data)); + + /* Setup new billing data (based on call answer time, in case this module started late with active calls) */ + nibble_data->lastts = profile->times->answered; /* Set the initial answer time to match when the call was really answered */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Beginning new billing on %s\n", uuid); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Last successful billing time was %s\n", date); + } + + switch_time_exp_lt(&tm, nibble_data->lastts); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%d seconds passed since last bill time of %s\n", (int) ((ts - nibble_data->lastts) / 1000000), date); + + if ((ts - nibble_data->lastts) >= 0) { + /* Convert billrate into microseconds and multiply by # of microseconds that have passed since last *successful* bill */ + billamount = ((float)atof(billrate) / 1000000 / 60) * ((ts - nibble_data->lastts)) - nibble_data->bill_adjustments; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Billing $%f to %s (Call: %s / %f so far)\n", billamount, billaccount, uuid, nibble_data->total); + + /* DO ODBC BILLING HERE and reset counters if it's successful! */ + if (bill_event(billamount, billaccount) == SWITCH_STATUS_SUCCESS) { + /* Increment total cost */ + nibble_data->total += billamount; + + /* Reset manual billing adjustments from pausing */ + nibble_data->bill_adjustments = 0; + + /* Update channel variable with current billing */ + tmp = switch_mprintf("%f", nibble_data->total); + switch_channel_set_variable(channel, "nibble_total_billed", tmp); + switch_safe_free(tmp); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to log to database!\n"); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Just tried to bill %s negative minutes! That should be impossible.\n", uuid); + } + + /* Update the last time we billed */ + nibble_data->lastts = ts; + + /* Save this location, but only if the channel/session are not hungup (otherwise, we're done) */ + if (channel && switch_channel_get_state(channel) != CS_HANGUP) { + float balance; + + switch_channel_set_private(channel, "_nibble_data_", nibble_data); + + /* See if this person has enough money left to continue the call */ + balance = get_balance(billaccount); + if (balance < globals.nobal_amt) { + /* Not enough money - reroute call to nobal location */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount); + + /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */ + /* in nibblebill checking the call again in the routing process for an allowed balance! */ + /* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */ + nibblebill_pause(session); + transfer_call(session, globals.nobal_action); + } + } + + /* Done changing - release lock */ + if (globals.mutex) { + switch_mutex_unlock(globals.mutex); + } + + /* Go check if this call is allowed to continue */ + + return SWITCH_STATUS_SUCCESS; +} + +/* You can turn on session heartbeat on a channel to have us check billing more often */ +static void event_handler(switch_event_t *event) +{ + switch_core_session_t *session; + char *uuid; + + if (!event){ + /* We should never get here - it means an event came in without the event info */ + return; + } + + /* Make sure everything is sane */ + if (!(uuid = switch_event_get_header(event, "Unique-ID"))){ + /* Donde esta channel? */ + return; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received request via %s!\n", switch_event_name (event->event_id)); + + /* Display debugging info */ + if (switch_event_get_header(event, "nibble_debug")) { + debug_event_handler(event); + } + + /* Get session var */ + if (!(session = switch_core_session_locate(uuid))) { + return; + } + + /* Go bill */ + do_billing(session); + + switch_core_session_rwunlock(session); +} + +static void nibblebill_pause(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_time_t ts = switch_micro_time_now(); + nibble_data_t *nibble_data; + + if (!channel) { + return; + } + + /* Lock this session's data for this module while we tinker with it */ + if (globals.mutex) { + switch_mutex_lock(globals.mutex); + } + + /* Get our nibble data var. This will be NULL if it's our first call here for this session */ + nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_"); + + if (!nibble_data) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Can't pause - channel is not initialized for billing!\n"); + return; + } + + /* Set pause counter if not already set */ + if (nibble_data->pausets == 0) + nibble_data->pausets = ts; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Paused billing timestamp!\n"); + + /* Done checking - release lock */ + if (globals.mutex) { + switch_mutex_unlock(globals.mutex); + } +} + +static void nibblebill_resume(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_time_t ts = switch_micro_time_now(); + nibble_data_t *nibble_data; + const char *billrate; + + if (!channel) { + return; + } + + /* Get our nibble data var. This will be NULL if it's our first call here for this session */ + nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_"); + + if (!nibble_data) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Can't resume - channel is not initialized for billing (This is expected at hangup time)!\n"); + return; + } + + if (nibble_data->pausets == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Can't resume - channel is not paused! (This is expected at hangup time)\n"); + return; + } + + /* Lock this session's data for this module while we tinker with it */ + if (globals.mutex) { + switch_mutex_lock(globals.mutex); + } + + billrate = switch_channel_get_variable(channel, "nibble_rate"); + + /* Calculate how much was "lost" to billings during pause - we do this here because you never know when the billrate may change during a call */ + nibble_data->bill_adjustments += ((float)atof(billrate) / 1000000 / 60) * ((ts - nibble_data->pausets)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Resumed billing! Subtracted %f from this billing cycle.\n", (atof(billrate) / 1000000 / 60) * ((ts - nibble_data->pausets))); + + nibble_data->pausets = 0; + + /* Done checking - release lock */ + if (globals.mutex) { + switch_mutex_unlock(globals.mutex); + } +} + +static void nibblebill_reset(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_time_t ts = switch_micro_time_now(); + nibble_data_t *nibble_data; + + if (!channel) { + return; + } + + /* Get our nibble data var. This will be NULL if it's our first call here for this session */ + nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_"); + + if (!nibble_data) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Can't reset - channel is not initialized for billing!\n"); + return; + } + + /* Lock this session's data for this module while we tinker with it */ + if (globals.mutex) { + switch_mutex_lock(globals.mutex); + } + + /* Update the last time we billed */ + nibble_data->lastts = ts; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Reset last billing timestamp marker to right now!\n"); + + /* Done checking - release lock */ + if (globals.mutex) { + switch_mutex_unlock(globals.mutex); + } +} + +static float nibblebill_check(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + nibble_data_t *nibble_data; + float amount = 0; + + if (!channel) { + return -99999; + } + + /* Get our nibble data var. This will be NULL if it's our first call here for this session */ + nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_"); + + if (!nibble_data) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Can't check - channel is not initialized for billing!\n"); + return -99999; + } + + /* Lock this session's data for this module while we tinker with it */ + if (globals.mutex) { + switch_mutex_lock(globals.mutex); + } + + amount = nibble_data->total; + + /* Done checking - release lock */ + if (globals.mutex) { + switch_mutex_unlock(globals.mutex); + } + + return amount; +} + +static void nibblebill_adjust(switch_core_session_t *session, float amount) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + const char *billaccount; + + if (!channel) { + return; + } + + /* Variables kept in FS but relevant only to this module */ + + billaccount = switch_channel_get_variable(channel, "nibble_account"); + + /* Return if there's no billing information on this session */ + if (!billaccount) { + return; + } + + /* Add or remove amount from adjusted billing here. Note, we bill the OPPOSITE */ + if (bill_event(-amount, billaccount) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Recorded adjustment to %s for $%f\n", billaccount, amount); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to record adjustment to %s for $%f\n", billaccount, amount); + } +} + +#define APP_SYNTAX "pause | resume | reset | adjust <amount> | heartbeat <seconds> | check" +SWITCH_STANDARD_APP(nibblebill_app_function) +{ + int argc = 0; + char *lbuf = NULL; + char *argv[3] = { 0 }; + + if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (!strcasecmp(argv[0], "adjust") && argc == 2) { + nibblebill_adjust(session, (float)atof(argv[1])); + } else if (!strcasecmp(argv[0], "flush")) { + do_billing(session); + } else if (!strcasecmp(argv[0], "pause")) { + nibblebill_pause(session); + } else if (!strcasecmp(argv[0], "resume")) { + nibblebill_resume(session); + } else if (!strcasecmp(argv[0], "check")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Current billing is at $%f\n", nibblebill_check(session)); + } else if (!strcasecmp(argv[0], "reset")) { + nibblebill_reset(session); + } else if (!strcasecmp(argv[0], "heartbeat") && argc == 2) { + switch_core_session_enable_heartbeat(session, atoi(argv[1])); + } + } +} + +/* We get here from the API only (theoretically) */ +#define API_SYNTAX "<uuid> [pause | resume | reset | adjust <amount> | heartbeat <seconds> | check]" +SWITCH_STANDARD_API(nibblebill_api_function) +{ + switch_core_session_t *psession = NULL; + char *mycmd = NULL, *argv[3] = { 0 }; + int argc = 0; + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if ((argc == 2 || argc == 3) && !switch_strlen_zero(argv[0])) { + char *uuid = argv[0]; + if ((psession = switch_core_session_locate(uuid))) { + switch_channel_t *channel; + channel = switch_core_session_get_channel(psession); + + if (!strcasecmp(argv[1], "adjust") && argc == 3) { + nibblebill_adjust(psession, (float)atof(argv[2])); + } else if (!strcasecmp(argv[1], "flush")) { + do_billing(psession); + } else if (!strcasecmp(argv[1], "pause")) { + nibblebill_pause(psession); + } else if (!strcasecmp(argv[1], "resume")) { + nibblebill_resume(psession); + } else if (!strcasecmp(argv[1], "check")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Current billing is at $%f\n", nibblebill_check(psession)); + } else if (!strcasecmp(argv[1], "reset")) { + nibblebill_reset(psession); + } else if (!strcasecmp(argv[1], "heartbeat") && argc == 3) { + switch_core_session_enable_heartbeat(psession, atoi(argv[2])); + } + + switch_core_session_rwunlock(psession); + } else { + stream->write_function(stream, "-ERR No Such Channel!\n"); + } + } else { + stream->write_function(stream, "-USAGE: %s\n", API_SYNTAX); + } + } + + return SWITCH_STATUS_SUCCESS; +} + +/* Check if session has variable "billrate" set. If it does, activate the heartbeat variable + switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds) + switch_core_session_sched_heartbeat(switch_core_session_t *session, uint32_t seconds)*/ + +static switch_status_t sched_billing(switch_core_session_t *session) +{ + if (globals.global_heartbeat > 0) { + switch_core_session_enable_heartbeat(session, globals.global_heartbeat); + } + + /* TODO: Check account balance here */ + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t process_hangup(switch_core_session_t *session) +{ + /* Resume any paused billings, just in case */ + // nibblebill_resume(session); + + /* Now go handle like normal billing */ + do_billing(session); + + return SWITCH_STATUS_SUCCESS; +} + +switch_state_handler_table_t nibble_state_handler = +{ + /* on_init */ NULL, + /* on_routing */ NULL, /* Need to add a check here for anything in their account before routing */ + /* on_execute */ sched_billing, /* Turn on heartbeat for this session and do an initial account check */ + /* on_hangup */ process_hangup, /* On hangup - most important place to go bill */ + /* on_exch_media */ NULL, + /* on_soft_exec */ NULL, + /* on_consume_med */ NULL, + /* on_hibernate */ NULL, + /* on_reset */ NULL +}; + +SWITCH_MODULE_LOAD_FUNCTION(mod_nibblebill_load) +{ + switch_api_interface_t *api_interface; + switch_application_interface_t *app_interface; + + /* Set every byte in this structure to 0 */ + memset(&globals, 0, sizeof(globals)); + globals.pool = pool; + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); + + load_config(); + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + /* Add API and CLI commands */ + SWITCH_ADD_API(api_interface, "nibblebill", "Manage billing parameters for a channel/call", nibblebill_api_function, API_SYNTAX); + + /* Add dialplan applications */ + SWITCH_ADD_APP(app_interface, "nibblebill", "Handle billing for the current channel/call", "Pause, resume, reset, adjust, flush, heartbeat commands to handle billing.", nibblebill_app_function, APP_SYNTAX, SAF_NONE); + + /* register state handlers for billing */ + switch_core_add_state_handler(&nibble_state_handler); + + /* bind to heartbeat events */ + if (switch_event_bind_removable(modname, SWITCH_EVENT_SESSION_HEARTBEAT, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event to monitor for session heartbeats!\n"); + return SWITCH_STATUS_GENERR; + } + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_nibblebill_shutdown) +{ + switch_event_unbind(&globals.node); + switch_core_remove_state_handler(&nibble_state_handler); + +#ifdef SWITCH_HAVE_ODBC + switch_odbc_handle_disconnect(globals.master_odbc); +#endif + + return SWITCH_STATUS_UNLOAD; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[Freeswitch-svn] [commit] r13457 - freeswitch/trunk/src
by FreeSWITCH SVN 27 May '09

27 May '09

Author: mikej Date: Tue May 26 23:22:35 2009 New Revision: 13457 Log: fix type issue Modified: freeswitch/trunk/src/switch_apr.c Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Tue May 26 23:22:35 2009 @@ -74,7 +74,7 @@ #ifndef WIN32 return apr_os_thread_current(); #else - return (GetCurrentThreadId()); + return (switch_thread_id_t)(GetCurrentThreadId()); #endif }

1 0

[Freeswitch-svn] [commit] r13456 - freeswitch/trunk/src
by FreeSWITCH SVN 27 May '09

27 May '09

Author: mikej Date: Tue May 26 23:21:51 2009 New Revision: 13456 Log: dos2unix Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue May 26 23:21:51 2009 @@ -2325,9 +2325,9 @@ static const char *ent[] = { "lt;", "<", "gt;", ">", "quot;", """, "apos;", "'", "amp;", "&", NULL }; - switch_xml_root_t root = (switch_xml_root_t) malloc(sizeof(struct switch_xml_root)); - if (!root) return NULL; - memset(root, '\0', sizeof(struct switch_xml_root)); + switch_xml_root_t root = (switch_xml_root_t) malloc(sizeof(struct switch_xml_root)); + if (!root) return NULL; + memset(root, '\0', sizeof(struct switch_xml_root)); root->xml.name = (char *) name; root->cur = &root->xml; strcpy(root->err, root->xml.txt = (char *)""); @@ -2383,8 +2383,8 @@ switch_xml_t child; if (!xml) return NULL; - if (!(child = (switch_xml_t) malloc(sizeof(struct switch_xml)))) return NULL; - memset(child, '\0', sizeof(struct switch_xml)); + if (!(child = (switch_xml_t) malloc(sizeof(struct switch_xml)))) return NULL; + memset(child, '\0', sizeof(struct switch_xml)); child->name = (char *) name; child->attr = SWITCH_XML_NIL; child->off = off;

1 0

[Freeswitch-svn] [commit] r13455 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 21:51:15 2009 New Revision: 13455 Log: fix leak and remove duplicate safe_free Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue May 26 21:51:15 2009 @@ -2062,12 +2062,13 @@ SWITCH_STANDARD_API(break_function) { switch_core_session_t *psession = NULL; - char *mycmd, *flag; + char *mycmd = NULL, *flag; switch_channel_t *channel = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", BREAK_SYNTAX); - return SWITCH_STATUS_SUCCESS; + goto done; } mycmd = strdup(cmd); @@ -2079,7 +2080,7 @@ if (!(psession = switch_core_session_locate(mycmd))) { stream->write_function(stream, "-ERR No Such Channel!\n"); - return SWITCH_STATUS_SUCCESS; + goto done; } if (flag && !strcasecmp(flag, "all")) { @@ -2092,9 +2093,15 @@ } else { switch_channel_set_flag(channel, CF_BREAK); } - switch_core_session_rwunlock(psession); - return SWITCH_STATUS_SUCCESS; + done: + if (psession) { + switch_core_session_rwunlock(psession); + } + + switch_safe_free(mycmd); + + return status; } #define PAUSE_SYNTAX "<uuid> <on|off>" @@ -2340,8 +2347,6 @@ if (api_task->recur) { task->runtime = switch_epoch_time_now(NULL) + api_task->recur; } - - } #define UNSCHED_SYNTAX "<task_id>" @@ -2383,7 +2388,6 @@ if ((dcmd = strchr(group, ' '))) { *dcmd++ = '\0'; - if (*tm == '+') { when = switch_epoch_time_now(NULL) + atol(tm + 1); } else if (*tm == '@') { @@ -2432,8 +2436,9 @@ char *arg; switch_memory_pool_t *pool; - if (!job) + if (!job) { return NULL; + } switch_thread_rwlock_rdlock(bgapi_rwlock); @@ -2622,7 +2627,6 @@ #define COMPLETE_SYNTAX "add <word>|del [<word>|*]" SWITCH_STANDARD_API(complete_function) { - switch_status_t status; if ((status = switch_console_set_complete(cmd)) == SWITCH_STATUS_SUCCESS) { @@ -2637,7 +2641,6 @@ #define ALIAS_SYNTAX "add <alias> <command> | del [<alias>|*]" SWITCH_STANDARD_API(alias_function) { - switch_status_t status; if ((status = switch_console_set_alias(cmd)) == SWITCH_STATUS_SUCCESS) { @@ -2958,7 +2961,6 @@ switch_safe_free(mycmd); stream->write_function(stream, "-ERR Usage: uuid_session_heartbeat %s", HEARTBEAT_SYNTAX); return SWITCH_STATUS_SUCCESS; - } SWITCH_STANDARD_API(uuid_flush_dtmf_function) @@ -3156,7 +3158,6 @@ usage: stream->write_function(stream, "-USAGE: %s\n", UUID_SEND_DTMF_SYNTAX); - switch_safe_free(mycmd); done: if (psession) { @@ -3263,7 +3264,6 @@ #define GLOBAL_GETVAR_SYNTAX "<var>" SWITCH_STANDARD_API(global_getvar_function) { - if (switch_strlen_zero(cmd)) { switch_core_dump_variables(stream); } else { @@ -3352,7 +3352,6 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_commands_shutdown) { int x; - for (x = 30; x > 0; x--) { if (switch_thread_rwlock_trywrlock(bgapi_rwlock) == SWITCH_STATUS_SUCCESS) { @@ -3372,7 +3371,6 @@ return SWITCH_STATUS_SUCCESS; } - SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load) { switch_api_interface_t *commands_api_interface;

1 0

[Freeswitch-svn] [commit] r13454 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 21:41:55 2009 New Revision: 13454 Log: remove another double safe_free Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue May 26 21:41:55 2009 @@ -2048,7 +2048,6 @@ usage: stream->write_function(stream, "-USAGE: %s\n", DISPLACE_SYNTAX); - switch_safe_free(mycmd); done: if (rsession) {

1 0

[Freeswitch-svn] [commit] r13453 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 21:41:29 2009 New Revision: 13453 Log: remove double safe_free Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue May 26 21:41:29 2009 @@ -1985,7 +1985,6 @@ usage: stream->write_function(stream, "-USAGE: %s\n", SESS_REC_SYNTAX); - switch_safe_free(mycmd); done: if (rsession) {

1 0