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 3879cca7d47accf3964585cd0637dc5ab098874c..d9e2b822c03d580669e91fa62a360dacc869e760 100644 (file)
--- 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 eb7e45ebc0595272086e9bc96d42488d9c70a952..c124fce4e2344fa4e8c4d2aeee9ea6d983089a2a 100644 (file)
--- 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 f6887060fcbf85d6e88a0187fa294dc82c6dbebf..a7445a1b18c0bb2baafa2fb78491aef237b048ba 100644 (file)
--- 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")) {