From: Mathieu Parent <math.parent@gmail.com>
Date: Tue, 10 May 2011 20:53:23 +0000 (+0200)
Subject: Skinny: rename skinny-route to skinny-process
X-Git-Tag: v1.2-rc1~108^2~11^2~42^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f6c469e44cea530d0a4938e24bbdcf4d60e91b8;p=thirdparty%2Ffreeswitch.git

Skinny: rename skinny-route to skinny-process

this is needed to differentiate route/cfwd
---

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index 3879cca7d4..d9e2b822c0 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -673,12 +673,12 @@ switch_status_t channel_on_routing(switch_core_session_t *session)
 		struct channel_on_routing_helper helper = {0};
 
 		if(switch_test_flag(tech_pvt, TFLAG_FORCE_ROUTE)) {
-			action = SKINNY_ACTION_ROUTE;
+			action = SKINNY_ACTION_PROCESS;
 		} else {
 			action = skinny_session_dest_match_pattern(session, &data);
 		}
 		switch(action) {
-			case SKINNY_ACTION_ROUTE:
+			case SKINNY_ACTION_PROCESS:
 				skinny_profile_find_listener_by_device_name_and_instance(tech_pvt->profile,
 					switch_channel_get_variable(channel, "skinny_device_name"),
 					atoi(switch_channel_get_variable(channel, "skinny_device_instance")), &listener);
diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.h b/src/mod/endpoints/mod_skinny/mod_skinny.h
index eb7e45ebc0..c124fce4e2 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.h
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.h
@@ -117,7 +117,7 @@ struct skinny_device_type_params {
 typedef struct skinny_device_type_params skinny_device_type_params_t;
 
 typedef enum {
-	SKINNY_ACTION_ROUTE,
+	SKINNY_ACTION_PROCESS,
 	SKINNY_ACTION_DROP,
 	SKINNY_ACTION_WAIT
 } skinny_action_t;
@@ -174,12 +174,12 @@ typedef enum {
 
 struct private_object {
 	unsigned int flags;
+	switch_mutex_t *flag_mutex;
 	switch_frame_t read_frame;
 	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
 	switch_core_session_t *session;
 	switch_caller_profile_t *caller_profile;
 	switch_mutex_t *mutex;
-	switch_mutex_t *flag_mutex;
 
 	/* identification */
 	skinny_profile_t *profile;
diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index f6887060fc..a7445a1b18 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -238,8 +238,8 @@ found:
 
 			extension->current_application = extension->current_application->next;
 
-			if (!strcmp(current_application->application_name, "skinny-route")) {
-				action = SKINNY_ACTION_ROUTE;
+			if (!strcmp(current_application->application_name, "skinny-route") || !strcmp(current_application->application_name, "skinny-process")) {
+				action = SKINNY_ACTION_PROCESS;
 			} else if (!strcmp(current_application->application_name, "skinny-drop")) {
 				action = SKINNY_ACTION_DROP;
 			} else if (!strcmp(current_application->application_name, "skinny-wait")) {