[Freeswitch-trunk] [commit] r12689 - freeswitch/trunk/src/mod/applications/mod_lcr

[FreeSWITCH SVN]

Author: rupa
Date: Fri Mar 20 15:23:32 2009
New Revision: 12689

Log:
oops, fix test for invalid profile


Modified:
   freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c

Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	Fri Mar 20 15:23:32 2009
@@ -530,13 +530,13 @@
 
 	digits_copy = string_digitsonly(cb_struct->pool, digits);
 	if (switch_strlen_zero(digits_copy)) {
-		return SWITCH_FALSE;
+		return SWITCH_STATUS_GENERR;
 	}
 	
 	/* allocate the dedup hash */
 	if (switch_core_hash_init(&cb_struct->dedup_hash, cb_struct->pool) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error initializing the dedup hash\n");
-		return SWITCH_STATUS_FALSE;
+		return SWITCH_STATUS_GENERR;
 	}
 	
 	digits_expanded = expand_digits(cb_struct->pool, digits_copy, cb_struct->profile->quote_in_list);
@@ -586,7 +586,7 @@
 	}
 }
 
-switch_status_t test_profile(char *lcr_profile)
+switch_bool_t test_profile(char *lcr_profile)
 {
 	callback_t routes = { 0 };
 	switch_memory_pool_t *pool = NULL;
@@ -603,7 +603,8 @@
 	}
 	
 	routes.lookup_number = "15555551212";
-	return lcr_do_lookup(&routes, routes.lookup_number);
+	return (lcr_do_lookup(&routes, routes.lookup_number) == SWITCH_STATUS_SUCCESS) ?
+	        SWITCH_TRUE : SWITCH_FALSE;
 }
 
 static switch_status_t lcr_load_config()
@@ -805,12 +806,13 @@
 				switch_core_hash_insert(globals.profile_hash, profile->name, profile);
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loaded lcr profile %s.\n", profile->name);
 				/* test the profile */
-				if (test_profile(profile->name) != SWITCH_TRUE) {
+				if (test_profile(profile->name) == SWITCH_TRUE) {
 					if (!strcasecmp(profile->name, "default")) {
 						globals.default_profile = profile;
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Setting user defined default profile: %s.\n", profile->name);
 					}
 				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Removing INAVLID Profile %s.\n", profile->name);
 					switch_core_hash_delete(globals.profile_hash, profile->name);
 				}