fix small valet parking issue

src/mod/applications/mod_valet_parking/mod_valet_parking.c

@@ -39,6 +39,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_valet_parking_load);
 SWITCH_MODULE_DEFINITION(mod_valet_parking, mod_valet_parking_load, NULL, NULL);
 
 typedef struct {
+	char ext[256];
 	char uuid[SWITCH_UUID_FORMATTED_LENGTH + 1];
 	time_t timeout;
 } valet_token_t;
@@ -104,7 +105,7 @@ static void check_timeouts(void)
 	now = switch_epoch_time_now(NULL);
 
 	switch_mutex_lock(globals.mutex);
-	if (now - globals.last_timeout_check > 30) {
+	if (now - globals.last_timeout_check < 30) {
 		switch_mutex_unlock(globals.mutex);
 		return;
 	}
@@ -144,10 +145,10 @@ static void check_timeouts(void)
 
 }
 
-static int next_id(valet_lot_t *lot, int min, int max, int in)
+static valet_token_t *next_id(switch_core_session_t *session, valet_lot_t *lot, int min, int max, int in)
 {
 	int i, r = 0;
-	char buf[128] = "";
+	char buf[256] = "";
 	valet_token_t *token;
 
 	if (!min) {
@@ -164,9 +165,20 @@ static int next_id(valet_lot_t *lot, int min, int max, int in)
 			break;
 		}
 	}
+
+	token = NULL;
+
+	if (r) {
+		switch_snprintf(buf, sizeof(buf), "%d", r);
+		switch_zmalloc(token, sizeof(*token));
+		switch_set_string(token->uuid, switch_core_session_get_uuid(session));
+		switch_set_string(token->ext, buf);
+		switch_core_hash_insert(lot->hash, buf, token);
+	}
+
 	switch_mutex_unlock(globals.mutex);
 
-	return r;
+	return token;
 }
 
 
@@ -182,6 +194,9 @@ SWITCH_STANDARD_APP(valet_parking_function)
 	const char *var;
 	valet_token_t *token = NULL;
 
+
+	check_timeouts();
+
 	if ((var = switch_channel_get_variable(channel, "valet_announce_slot"))) {
 		play_announce = switch_true(var);
 	}
@@ -206,7 +221,7 @@ SWITCH_STANDARD_APP(valet_parking_function)
 			const char *io = argv[2];
 			const char *min = argv[3];
 			const char *max = argv[4];
-			int min_i, max_i, id, in = -1;
+			int min_i, max_i, in = -1;
 
 			if (argc < 5) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", VALET_APP_SYNTAX);
@@ -231,13 +246,13 @@ SWITCH_STANDARD_APP(valet_parking_function)
 			min_i = atoi(min);
 			max_i = atoi(max);
 
-			if (!(id = next_id(lot, min_i, max_i, in))) {
+			if (!(token = next_id(session, lot, min_i, max_i, in))) {
 				switch_ivr_phrase_macro(session, in ? "valet_lot_full" : "valet_lot_empty", "", NULL, NULL);
 				switch_mutex_unlock(lot->mutex);
 				return;
 			}
 
-			switch_snprintf(dtmf_buf, sizeof(dtmf_buf), "%d", id);
+			switch_snprintf(dtmf_buf, sizeof(dtmf_buf), "%s", token->ext);
 			ext = dtmf_buf;
 		} else if (!strcasecmp(ext, "ask")) {
 			const char *prompt = "ivr/ivr-enter_ext_pound.wav";
@@ -283,60 +298,63 @@ SWITCH_STANDARD_APP(valet_parking_function)
 			}
 		}
 
-		switch_mutex_lock(lot->mutex);
-		if ((token = (valet_token_t *) switch_core_hash_find(lot->hash, ext))) {
-			switch_core_session_t *b_session;
+		if (!token) {
+			switch_mutex_lock(lot->mutex);
+			if ((token = (valet_token_t *) switch_core_hash_find(lot->hash, ext))) {
+				switch_core_session_t *b_session;
 			
-			if (token->timeout) {
-				const char *var = switch_channel_get_variable(channel, "valet_ticket");
+				if (token->timeout) {
+					const char *var = switch_channel_get_variable(channel, "valet_ticket");
 				
-				if (!zstr(var)) {
-					if (!strcmp(var, token->uuid)) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Valet ticket %s accepted.\n", var);
-						token->timeout = 0;
-						switch_channel_set_variable(channel, "valet_ticket", NULL);
-					} else {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid token %s\n", token->uuid);
-						switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-						return;
+					if (!zstr(var)) {
+						if (!strcmp(var, token->uuid)) {
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Valet ticket %s accepted.\n", var);
+							token->timeout = 0;
+							switch_channel_set_variable(channel, "valet_ticket", NULL);
+						} else {
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid token %s\n", token->uuid);
+							switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+							return;
+						}
 					}
 				}
-			}
 
-			if (!zstr(token->uuid) && (b_session = switch_core_session_locate(token->uuid))) {
-				if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, VALET_EVENT) == SWITCH_STATUS_SUCCESS) {
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Valet-Lot-Name", lot_name);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Valet-Extension", ext);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "bridge");
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Bridge-To-UUID", switch_core_session_get_uuid(session));
-					switch_channel_event_set_data(switch_core_session_get_channel(b_session), event);
-					switch_event_fire(&event);
-					switch_core_session_rwunlock(b_session);
-					token->timeout = 0;
-					switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), token->uuid);
-					switch_mutex_unlock(lot->mutex);
-					return;
+				if (!zstr(token->uuid) && (b_session = switch_core_session_locate(token->uuid))) {
+					if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, VALET_EVENT) == SWITCH_STATUS_SUCCESS) {
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Valet-Lot-Name", lot_name);
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Valet-Extension", ext);
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "bridge");
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Bridge-To-UUID", switch_core_session_get_uuid(session));
+						switch_channel_event_set_data(switch_core_session_get_channel(b_session), event);
+						switch_event_fire(&event);
+						switch_core_session_rwunlock(b_session);
+						token->timeout = 0;
+						switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), token->uuid);
+						switch_mutex_unlock(lot->mutex);
+						return;
+					}
 				}
 			}
-		}
 
+			token = NULL;
 
-		token = NULL;
+			switch_zmalloc(token, sizeof(*token));
+			switch_set_string(token->uuid, switch_core_session_get_uuid(session));
+			switch_core_hash_insert(lot->hash, ext, token);
+		}
 
 		if (!(tmp = switch_channel_get_variable(channel, "valet_hold_music"))) {
 			tmp = switch_channel_get_hold_music(channel);
 		}
-		if (tmp)
+
+		if (tmp) {
 			music = tmp;
+		}
 
 		if (!strcasecmp(music, "silence")) {
 			music = "silence_stream://-1";
 		}
-
-		switch_zmalloc(token, sizeof(*token));
-		switch_set_string(token->uuid, switch_core_session_get_uuid(session));
-		switch_core_hash_insert(lot->hash, ext, token);
-
+		
 		dest = switch_core_session_sprintf(session, "set:valet_ticket=%s,set:valet_hold_music=%s,sleep:1000,valet_park:%s %s", 
 										   token->uuid, music, lot_name, ext);
 		switch_channel_set_variable(channel, "inline_destination", dest);
@@ -351,6 +369,7 @@ SWITCH_STANDARD_APP(valet_parking_function)
 				if ((b_session = switch_core_session_locate(uuid))) {
 					token->timeout = switch_epoch_time_now(NULL) + 10;		
 					if (play_announce) {
+						switch_ivr_sleep(session, 1500, SWITCH_TRUE, NULL);
 						switch_ivr_phrase_macro(session, "valet_announce_ext", tmp, NULL, NULL);
 					}
 					switch_ivr_session_transfer(b_session, dest, "inline", NULL);
@@ -362,6 +381,7 @@ SWITCH_STANDARD_APP(valet_parking_function)
 			}
 
 			if (play_announce) {
+				switch_ivr_sleep(session, 1500, SWITCH_TRUE, NULL);
 				switch_ivr_phrase_macro(session, "valet_announce_ext", tmp, NULL, NULL);
 			}
 		}
@@ -405,8 +425,6 @@ SWITCH_STANDARD_APP(valet_parking_function)
 
  end:
 
-	check_timeouts();
-
 	if (token) {
 		token->timeout = 1;
 	}