]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Skinny: Split ou tables
authorMathieu Parent <math.parent@gmail.com>
Wed, 17 Mar 2010 12:52:08 +0000 (12:52 +0000)
committerMathieu Parent <math.parent@gmail.com>
Wed, 17 Mar 2010 12:52:08 +0000 (12:52 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@17022 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/endpoints/mod_skinny/Makefile.am
src/mod/endpoints/mod_skinny/mod_skinny.c
src/mod/endpoints/mod_skinny/skinny_protocol.c
src/mod/endpoints/mod_skinny/skinny_protocol.h
src/mod/endpoints/mod_skinny/skinny_tables.c [new file with mode: 0644]
src/mod/endpoints/mod_skinny/skinny_tables.h [new file with mode: 0644]

index 304bbbf7c603de2406efd116f51735c992be9e82..212aa924ac654e3a01e0332687fff33d219cb9f6 100644 (file)
@@ -3,7 +3,7 @@ include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_skinny
 
 mod_LTLIBRARIES = mod_skinny.la
-mod_skinny_la_SOURCES  = mod_skinny.c skinny_protocol.c
+mod_skinny_la_SOURCES  = mod_skinny.c skinny_protocol.c skinny_tables.c
 mod_skinny_la_CFLAGS   = $(AM_CFLAGS) -DSKINNY_SVN_VERSION=\"`cat $(switch_builddir)/.version`\"
 mod_skinny_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_skinny_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
index 4fff074c0fd13d06d3cb980eaa8d1da062db5212..3107138b731cd5fbff6c36171a1e1918f60376da 100644 (file)
@@ -32,6 +32,7 @@
 #include <switch.h>
 #include "mod_skinny.h"
 #include "skinny_protocol.h"
+#include "skinny_tables.h"
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_skinny_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skinny_shutdown);
index ed9efa9916222f160d9a606b39e76bab9c3f7397..a7438c05cc964f34fb84aa6eaa2063c9ad092674 100644 (file)
@@ -32,6 +32,7 @@
 #include <switch.h>
 #include "mod_skinny.h"
 #include "skinny_protocol.h"
+#include "skinny_tables.h"
 
 skinny_globals_t globals;
 
@@ -58,162 +59,6 @@ struct soft_key_template_definition soft_key_template_default[] = {
        { "\200\120", SOFTKEY_IDIVERT },
 };
 
-/* Translation tables */
-struct skinny_table SKINNY_MESSAGE_TYPES[] = {
-       {"KeepAliveMessage", KEEP_ALIVE_MESSAGE},
-       {"RegisterMessage", REGISTER_MESSAGE},
-       {"PortMessage", PORT_MESSAGE},
-       {"KeypadButtonMessage", KEYPAD_BUTTON_MESSAGE},
-       {"StimulusMessage", STIMULUS_MESSAGE},
-       {"OffHookMessage", OFF_HOOK_MESSAGE},
-       {"OnHookMessage", ON_HOOK_MESSAGE},
-       {"SpeedDialStatReqMessage", SPEED_DIAL_STAT_REQ_MESSAGE},
-       {"LineStatReqMessage", LINE_STAT_REQ_MESSAGE},
-       {"ConfigStatReqMessage", CONFIG_STAT_REQ_MESSAGE},
-       {"TimeDateReqMessage", TIME_DATE_REQ_MESSAGE},
-       {"ButtonTemplateReqMessage", BUTTON_TEMPLATE_REQ_MESSAGE},
-       {"CapabilitiesReqMessage", CAPABILITIES_RES_MESSAGE},
-       {"AlarmMessage", ALARM_MESSAGE},
-       {"OpenReceiveChannelAckMessage", OPEN_RECEIVE_CHANNEL_ACK_MESSAGE},
-       {"SoftKeySetReqMessage", SOFT_KEY_SET_REQ_MESSAGE},
-       {"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
-       {"UnregisterMessage", UNREGISTER_MESSAGE},
-       {"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
-       {"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
-       {"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
-       {"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
-       {"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
-       {"RegisterAckMessage", REGISTER_ACK_MESSAGE},
-       {"StartToneMessage", START_TONE_MESSAGE},
-       {"StopToneMessage", STOP_TONE_MESSAGE},
-       {"SetRingerMessage", SET_RINGER_MESSAGE},
-       {"SetLampMessage", SET_LAMP_MESSAGE},
-       {"SetSpeakerModeMessage", SET_SPEAKER_MODE_MESSAGE},
-       {"StartMediaTransmissionMessage", START_MEDIA_TRANSMISSION_MESSAGE},
-       {"StopMediaTransmissionMessage", STOP_MEDIA_TRANSMISSION_MESSAGE},
-       {"CallInfoMessage", CALL_INFO_MESSAGE},
-       {"SpeedDialStatResMessage", SPEED_DIAL_STAT_RES_MESSAGE},
-       {"LineStatResMessage", LINE_STAT_RES_MESSAGE},
-       {"ConfigStatResMessage", CONFIG_STAT_RES_MESSAGE},
-       {"DefineTimeDateMessage", DEFINE_TIME_DATE_MESSAGE},
-       {"ButtonTemplateResMessage", BUTTON_TEMPLATE_RES_MESSAGE},
-       {"CapabilitiesReqMessage", CAPABILITIES_REQ_MESSAGE},
-       {"RegisterRejMessage", REGISTER_REJ_MESSAGE},
-       {"ResetMessage", RESET_MESSAGE},
-       {"KeepAliveAckMessage", KEEP_ALIVE_ACK_MESSAGE},
-       {"OpenReceiveChannelMessage", OPEN_RECEIVE_CHANNEL_MESSAGE},
-       {"OCloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
-       {"SoftKeyTemplateResMessage", SOFT_KEY_TEMPLATE_RES_MESSAGE},
-       {"SoftKeySetResMessage", SOFT_KEY_SET_RES_MESSAGE},
-       {"SelectSoftKeysMessage", SELECT_SOFT_KEYS_MESSAGE},
-       {"CallStateMessage", CALL_STATE_MESSAGE},
-       {"DisplayPromptStatusMessage", DISPLAY_PROMPT_STATUS_MESSAGE},
-       {"ClearPromptStatusMessage", CLEAR_PROMPT_STATUS_MESSAGE},
-       {"ActivateCallPlaneMessage", ACTIVATE_CALL_PLANE_MESSAGE},
-       {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
-       {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
-       {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
-       {"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_message_type2str, SKINNY_MESSAGE_TYPES, "UnknownMessage")
-SKINNY_DECLARE_STR2ID(skinny_str2message_type, SKINNY_MESSAGE_TYPES, -1)
-
-struct skinny_table SKINNY_RING_TYPES[] = {
-       {"RingOff", SKINNY_RING_OFF},
-       {"RingInside", SKINNY_RING_INSIDE},
-       {"RingOutside", SKINNY_RING_OUTSIDE},
-       {"RingFeature", SKINNY_RING_FEATURE},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_ring_type2str, SKINNY_RING_TYPES, "RingTypeUnknown")
-SKINNY_DECLARE_STR2ID(skinny_str2ring_type, SKINNY_RING_TYPES, -1)
-
-struct skinny_table SKINNY_RING_MODES[] = {
-       {"RingForever", SKINNY_RING_FOREVER},
-       {"RingOnce", SKINNY_RING_ONCE},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_ring_mode2str, SKINNY_RING_MODES, "RingModeUnknown")
-SKINNY_DECLARE_STR2ID(skinny_str2ring_mode, SKINNY_RING_MODES, -1)
-
-struct skinny_table SKINNY_BUTTONS[] = {
-       {"Unknown", SKINNY_BUTTON_UNKNOWN},
-       {"LastNumberRedial", SKINNY_BUTTON_LAST_NUMBER_REDIAL},
-       {"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
-       {"Line", SKINNY_BUTTON_LINE},
-       {"Voicemail", SKINNY_BUTTON_VOICEMAIL},
-       {"Privacy", SKINNY_BUTTON_PRIVACY},
-       {"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
-       {"Undefined", SKINNY_BUTTON_UNDEFINED},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_button2str, SKINNY_BUTTONS, "Unknown")
-SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
-
-struct skinny_table SKINNY_LAMP_MODES[] = {
-       {"Off", SKINNY_LAMP_OFF},
-       {"On", SKINNY_LAMP_ON},
-       {"Wink", SKINNY_LAMP_WINK},
-       {"Flash", SKINNY_LAMP_FLASH},
-       {"Blink", SKINNY_LAMP_BLINK},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_lamp_mode2str, SKINNY_LAMP_MODES, "Unknown")
-SKINNY_DECLARE_STR2ID(skinny_str2lamp_mode, SKINNY_LAMP_MODES, -1)
-
-struct skinny_table SKINNY_SPEAKER_MODES[] = {
-       {"SpeakerOn", SKINNY_SPEAKER_ON},
-       {"SpeakerOff", SKINNY_SPEAKER_OFF},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_speaker_mode2str, SKINNY_SPEAKER_MODES, "Unknown")
-SKINNY_DECLARE_STR2ID(skinny_str2speaker_mode, SKINNY_SPEAKER_MODES, -1)
-
-struct skinny_table SKINNY_KEY_SETS[] = {
-       {"KeySetOnHook", SKINNY_KEY_SET_ON_HOOK},
-       {"KeySetConnected", SKINNY_KEY_SET_CONNECTED},
-       {"KeySetOnHold", SKINNY_KEY_SET_ON_HOLD},
-       {"KeySetRingIn", SKINNY_KEY_SET_RING_IN},
-       {"KeySetOffHook", SKINNY_KEY_SET_OFF_HOOK},
-       {"KeySetConnectedWithTransfer", SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER},
-       {"KeySetDigitsAfterDialingFirstDigit", SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT},
-       {"KeySetConnectedWithConference", SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE},
-       {"KeySetRingOut", SKINNY_KEY_SET_RING_OUT},
-       {"KeySetOffHookWithFeatures", SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_soft_key_set2str, SKINNY_KEY_SETS, "UNKNOWN_SOFT_KEY_SET")
-SKINNY_DECLARE_STR2ID(skinny_str2soft_key_set, SKINNY_KEY_SETS, -1)
-
-struct skinny_table SKINNY_CALL_STATES[] = {
-       {"OffHook", SKINNY_OFF_HOOK},
-       {"OnHook", SKINNY_ON_HOOK},
-       {"RingOut", SKINNY_RING_OUT},
-       {"RingIn", SKINNY_RING_IN},
-       {"Connected", SKINNY_CONNECTED},
-       {"Busy", SKINNY_BUSY},
-       {"Congestion", SKINNY_CONGESTION},
-       {"Hold", SKINNY_HOLD},
-       {"CallWaiting", SKINNY_CALL_WAITING},
-       {"CallTransfer", SKINNY_CALL_TRANSFER},
-       {"CallPark", SKINNY_CALL_PARK},
-       {"Proceed", SKINNY_PROCEED},
-       {"CallRemoteMultiline", SKINNY_CALL_REMOTE_MULTILINE},
-       {"InvalidNumber", SKINNY_INVALID_NUMBER},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_call_state2str, SKINNY_CALL_STATES, "CallStateUnknown")
-SKINNY_DECLARE_STR2ID(skinny_str2call_state, SKINNY_CALL_STATES, -1)
-
-struct skinny_table SKINNY_DEVICE_RESET_TYPES[] = {
-       {"DeviceReset", SKINNY_DEVICE_RESET},
-       {"DeviceRestart", SKINNY_DEVICE_RESTART},
-       {NULL, 0}
-};
-SKINNY_DECLARE_ID2STR(skinny_device_reset_type2str, SKINNY_DEVICE_RESET_TYPES, "DeviceResetTypeUnknown")
-SKINNY_DECLARE_STR2ID(skinny_str2device_reset_type, SKINNY_DEVICE_RESET_TYPES, -1)
-
 /*****************************************************************************/
 /* SKINNY FUNCTIONS */
 /*****************************************************************************/
index bd486d3d9e3c92d8afdec892d9fb509da5593961..c0af0b771ec2c90ea2d992ed3564e7185bcff201 100644 (file)
@@ -590,206 +590,6 @@ enum skinny_codecs {
 
 typedef switch_status_t (*skinny_command_t) (char **argv, int argc, switch_stream_handle_t *stream);
 
-/*****************************************************************************/
-/* SKINNY TABLES */
-/*****************************************************************************/
-struct skinny_table {
-       const char *name;
-       uint32_t id;
-};
-
-#define SKINNY_DECLARE_ID2STR(func, TABLE, DEFAULT_STR) \
-const char *func(uint32_t id) \
-{ \
-       const char *str = DEFAULT_STR; \
-       \
-       for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
-               if (TABLE[x].id == id) {\
-                       str = TABLE[x].name;\
-                       break;\
-               }\
-       }\
-       \
-       return str;\
-}
-
-#define SKINNY_DECLARE_STR2ID(func, TABLE, DEFAULT_ID) \
-uint32_t func(const char *str)\
-{\
-       uint32_t id = DEFAULT_ID;\
-       \
-       if (*str > 47 && *str < 58) {\
-               id = atoi(str);\
-       } else {\
-               for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1 && TABLE[x].name; x++) {\
-                       if (!strcasecmp(TABLE[x].name, str)) {\
-                               id = TABLE[x].id;\
-                               break;\
-                       }\
-               }\
-       }\
-       return id;\
-}
-
-#define SKINNY_DECLARE_PUSH_MATCH(TABLE) \
-       switch_console_callback_match_t *my_matches = NULL;\
-       for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
-               switch_console_push_match(&my_matches, TABLE[x].name);\
-       }\
-       if (my_matches) {\
-               *matches = my_matches;\
-               status = SWITCH_STATUS_SUCCESS;\
-       }
-       
-struct skinny_table SKINNY_MESSAGE_TYPES[55];
-const char *skinny_message_type2str(uint32_t id);
-uint32_t skinny_str2message_type(const char *str);
-#define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES)
-
-enum skinny_tone {
-       SKINNY_TONE_SILENCE = 0x00,
-       SKINNY_TONE_DIALTONE = 0x21,
-       SKINNY_TONE_BUSYTONE = 0x23,
-       SKINNY_TONE_ALERT = 0x24,
-       SKINNY_TONE_REORDER = 0x25,
-       SKINNY_TONE_CALLWAITTONE = 0x2D,
-       SKINNY_TONE_NOTONE = 0x7F,
-};
-
-enum skinny_ring_type {
-       SKINNY_RING_OFF = 1,
-       SKINNY_RING_INSIDE = 2,
-       SKINNY_RING_OUTSIDE = 3,
-       SKINNY_RING_FEATURE = 4
-};
-struct skinny_table SKINNY_RING_TYPES[5];
-const char *skinny_ring_type2str(uint32_t id);
-uint32_t skinny_str2ring_type(const char *str);
-#define SKINNY_PUSH_RING_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_RING_TYPES)
-
-enum skinny_ring_mode {
-       SKINNY_RING_FOREVER = 1,
-       SKINNY_RING_ONCE = 2,
-};
-struct skinny_table SKINNY_RING_MODES[3];
-const char *skinny_ring_mode2str(uint32_t id);
-uint32_t skinny_str2ring_mode(const char *str);
-#define SKINNY_PUSH_RING_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_RING_MODES)
-
-
-enum skinny_lamp_mode {
-       SKINNY_LAMP_OFF = 1,
-       SKINNY_LAMP_ON = 2,
-       SKINNY_LAMP_WINK = 3,
-       SKINNY_LAMP_FLASH = 4,
-       SKINNY_LAMP_BLINK = 5,
-};
-struct skinny_table SKINNY_LAMP_MODES[6];
-const char *skinny_lamp_mode2str(uint32_t id);
-uint32_t skinny_str2lamp_mode(const char *str);
-#define SKINNY_PUSH_LAMP_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_LAMP_MODES)
-
-enum skinny_speaker_mode {
-       SKINNY_SPEAKER_ON = 1,
-       SKINNY_SPEAKER_OFF = 2,
-};
-struct skinny_table SKINNY_SPEAKER_MODES[3];
-const char *skinny_speaker_mode2str(uint32_t id);
-uint32_t skinny_str2speaker_mode(const char *str);
-#define SKINNY_PUSH_SPEAKER_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_SPEAKER_MODES)
-
-enum skinny_call_type {
-       SKINNY_INBOUND_CALL = 1,
-       SKINNY_OUTBOUND_CALL = 2,
-       SKINNY_FORWARD_CALL = 3,
-};
-
-enum skinny_button_definition {
-       SKINNY_BUTTON_UNKNOWN = 0x00,
-       SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
-       SKINNY_BUTTON_SPEED_DIAL = 0x02,
-       SKINNY_BUTTON_LINE = 0x09,
-       SKINNY_BUTTON_VOICEMAIL = 0x0F,
-       SKINNY_BUTTON_PRIVACY = 0x13,
-       SKINNY_BUTTON_SERVICE_URL = 0x14,
-       SKINNY_BUTTON_UNDEFINED = 0xFF,
-};
-struct skinny_table SKINNY_BUTTONS[9];
-const char *skinny_button2str(uint32_t id);
-uint32_t skinny_str2button(const char *str);
-#define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS)
-
-enum skinny_soft_key_event {
-       SOFTKEY_REDIAL = 0x01,
-       SOFTKEY_NEWCALL = 0x02,
-       SOFTKEY_HOLD = 0x03,
-       SOFTKEY_TRANSFER = 0x04,
-       SOFTKEY_CFWDALL = 0x05,
-       SOFTKEY_CFWDBUSY = 0x06,
-       SOFTKEY_CFWDNOANSWER = 0x07,
-       SOFTKEY_BACKSPACE = 0x08,
-       SOFTKEY_ENDCALL = 0x09,
-       SOFTKEY_RESUME = 0x0A,
-       SOFTKEY_ANSWER = 0x0B,
-       SOFTKEY_INFO = 0x0C,
-       SOFTKEY_CONFRM = 0x0D,
-       SOFTKEY_PARK = 0x0E,
-       SOFTKEY_JOIN = 0x0F,
-       SOFTKEY_MEETMECONFRM = 0x10,
-       SOFTKEY_CALLPICKUP = 0x11,
-       SOFTKEY_GRPCALLPICKUP = 0x12,
-       SOFTKEY_DND = 0x13,
-       SOFTKEY_IDIVERT = 0x14,
-};
-
-enum skinny_key_set {
-       SKINNY_KEY_SET_ON_HOOK = 0,
-       SKINNY_KEY_SET_CONNECTED = 1,
-       SKINNY_KEY_SET_ON_HOLD = 2,
-       SKINNY_KEY_SET_RING_IN = 3,
-       SKINNY_KEY_SET_OFF_HOOK = 4,
-       SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER = 5,
-       SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT = 6,
-       SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE = 7,
-       SKINNY_KEY_SET_RING_OUT = 8,
-       SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES = 9,
-};
-struct skinny_table SKINNY_KEY_SETS[11];
-const char *skinny_soft_key_set2str(uint32_t id);
-uint32_t skinny_str2soft_key_set(const char *str);
-#define SKINNY_PUSH_SOFT_KEY_SETS SKINNY_DECLARE_PUSH_MATCH(SKINNY_KEY_SETS)
-
-
-enum skinny_call_state {
-       SKINNY_OFF_HOOK = 1,
-       SKINNY_ON_HOOK = 2,
-       SKINNY_RING_OUT = 3,
-       SKINNY_RING_IN = 4,
-       SKINNY_CONNECTED = 5,
-       SKINNY_BUSY = 6,
-       SKINNY_CONGESTION = 7,
-       SKINNY_HOLD = 8,
-       SKINNY_CALL_WAITING = 9,
-       SKINNY_CALL_TRANSFER = 10,
-       SKINNY_CALL_PARK = 11,
-       SKINNY_PROCEED = 12,
-       SKINNY_CALL_REMOTE_MULTILINE = 13,
-       SKINNY_INVALID_NUMBER = 14
-};
-struct skinny_table SKINNY_CALL_STATES[15];
-const char *skinny_call_state2str(uint32_t id);
-uint32_t skinny_str2call_state(const char *str);
-#define SKINNY_PUSH_CALL_STATES SKINNY_DECLARE_PUSH_MATCH(SKINNY_CALL_STATES)
-
-enum skinny_device_reset_types {
-  SKINNY_DEVICE_RESET = 1,
-  SKINNY_DEVICE_RESTART = 2
-};
-struct skinny_table SKINNY_DEVICE_RESET_TYPES[3];
-const char *skinny_device_reset_type2str(uint32_t id);
-uint32_t skinny_str2device_reset_type(const char *str);
-#define SKINNY_PUSH_DEVICE_RESET_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_DEVICE_RESET_TYPES)
-
 /*****************************************************************************/
 /* SKINNY FUNCTIONS */
 /*****************************************************************************/
diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.c b/src/mod/endpoints/mod_skinny/skinny_tables.c
new file mode 100644 (file)
index 0000000..667ae3c
--- /dev/null
@@ -0,0 +1,191 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2010, Mathieu Parent <math.parent@gmail.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
+ * Mathieu Parent <math.parent@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Mathieu Parent <math.parent@gmail.com>
+ *
+ *
+ * skinny_tables.c -- Skinny Call Control Protocol (SCCP) Endpoint Module
+ *
+ */
+
+#include "skinny_protocol.h"
+#include "skinny_tables.h"
+
+/* Translation tables */
+struct skinny_table SKINNY_MESSAGE_TYPES[] = {
+       {"KeepAliveMessage", KEEP_ALIVE_MESSAGE},
+       {"RegisterMessage", REGISTER_MESSAGE},
+       {"PortMessage", PORT_MESSAGE},
+       {"KeypadButtonMessage", KEYPAD_BUTTON_MESSAGE},
+       {"StimulusMessage", STIMULUS_MESSAGE},
+       {"OffHookMessage", OFF_HOOK_MESSAGE},
+       {"OnHookMessage", ON_HOOK_MESSAGE},
+       {"SpeedDialStatReqMessage", SPEED_DIAL_STAT_REQ_MESSAGE},
+       {"LineStatReqMessage", LINE_STAT_REQ_MESSAGE},
+       {"ConfigStatReqMessage", CONFIG_STAT_REQ_MESSAGE},
+       {"TimeDateReqMessage", TIME_DATE_REQ_MESSAGE},
+       {"ButtonTemplateReqMessage", BUTTON_TEMPLATE_REQ_MESSAGE},
+       {"CapabilitiesReqMessage", CAPABILITIES_RES_MESSAGE},
+       {"AlarmMessage", ALARM_MESSAGE},
+       {"OpenReceiveChannelAckMessage", OPEN_RECEIVE_CHANNEL_ACK_MESSAGE},
+       {"SoftKeySetReqMessage", SOFT_KEY_SET_REQ_MESSAGE},
+       {"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
+       {"UnregisterMessage", UNREGISTER_MESSAGE},
+       {"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
+       {"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
+       {"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
+       {"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
+       {"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
+       {"RegisterAckMessage", REGISTER_ACK_MESSAGE},
+       {"StartToneMessage", START_TONE_MESSAGE},
+       {"StopToneMessage", STOP_TONE_MESSAGE},
+       {"SetRingerMessage", SET_RINGER_MESSAGE},
+       {"SetLampMessage", SET_LAMP_MESSAGE},
+       {"SetSpeakerModeMessage", SET_SPEAKER_MODE_MESSAGE},
+       {"StartMediaTransmissionMessage", START_MEDIA_TRANSMISSION_MESSAGE},
+       {"StopMediaTransmissionMessage", STOP_MEDIA_TRANSMISSION_MESSAGE},
+       {"CallInfoMessage", CALL_INFO_MESSAGE},
+       {"SpeedDialStatResMessage", SPEED_DIAL_STAT_RES_MESSAGE},
+       {"LineStatResMessage", LINE_STAT_RES_MESSAGE},
+       {"ConfigStatResMessage", CONFIG_STAT_RES_MESSAGE},
+       {"DefineTimeDateMessage", DEFINE_TIME_DATE_MESSAGE},
+       {"ButtonTemplateResMessage", BUTTON_TEMPLATE_RES_MESSAGE},
+       {"CapabilitiesReqMessage", CAPABILITIES_REQ_MESSAGE},
+       {"RegisterRejMessage", REGISTER_REJ_MESSAGE},
+       {"ResetMessage", RESET_MESSAGE},
+       {"KeepAliveAckMessage", KEEP_ALIVE_ACK_MESSAGE},
+       {"OpenReceiveChannelMessage", OPEN_RECEIVE_CHANNEL_MESSAGE},
+       {"OCloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
+       {"SoftKeyTemplateResMessage", SOFT_KEY_TEMPLATE_RES_MESSAGE},
+       {"SoftKeySetResMessage", SOFT_KEY_SET_RES_MESSAGE},
+       {"SelectSoftKeysMessage", SELECT_SOFT_KEYS_MESSAGE},
+       {"CallStateMessage", CALL_STATE_MESSAGE},
+       {"DisplayPromptStatusMessage", DISPLAY_PROMPT_STATUS_MESSAGE},
+       {"ClearPromptStatusMessage", CLEAR_PROMPT_STATUS_MESSAGE},
+       {"ActivateCallPlaneMessage", ACTIVATE_CALL_PLANE_MESSAGE},
+       {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
+       {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
+       {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
+       {"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_message_type2str, SKINNY_MESSAGE_TYPES, "UnknownMessage")
+SKINNY_DECLARE_STR2ID(skinny_str2message_type, SKINNY_MESSAGE_TYPES, -1)
+
+struct skinny_table SKINNY_RING_TYPES[] = {
+       {"RingOff", SKINNY_RING_OFF},
+       {"RingInside", SKINNY_RING_INSIDE},
+       {"RingOutside", SKINNY_RING_OUTSIDE},
+       {"RingFeature", SKINNY_RING_FEATURE},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_ring_type2str, SKINNY_RING_TYPES, "RingTypeUnknown")
+SKINNY_DECLARE_STR2ID(skinny_str2ring_type, SKINNY_RING_TYPES, -1)
+
+struct skinny_table SKINNY_RING_MODES[] = {
+       {"RingForever", SKINNY_RING_FOREVER},
+       {"RingOnce", SKINNY_RING_ONCE},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_ring_mode2str, SKINNY_RING_MODES, "RingModeUnknown")
+SKINNY_DECLARE_STR2ID(skinny_str2ring_mode, SKINNY_RING_MODES, -1)
+
+struct skinny_table SKINNY_BUTTONS[] = {
+       {"Unknown", SKINNY_BUTTON_UNKNOWN},
+       {"LastNumberRedial", SKINNY_BUTTON_LAST_NUMBER_REDIAL},
+       {"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
+       {"Line", SKINNY_BUTTON_LINE},
+       {"Voicemail", SKINNY_BUTTON_VOICEMAIL},
+       {"Privacy", SKINNY_BUTTON_PRIVACY},
+       {"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
+       {"Undefined", SKINNY_BUTTON_UNDEFINED},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_button2str, SKINNY_BUTTONS, "Unknown")
+SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
+
+struct skinny_table SKINNY_LAMP_MODES[] = {
+       {"Off", SKINNY_LAMP_OFF},
+       {"On", SKINNY_LAMP_ON},
+       {"Wink", SKINNY_LAMP_WINK},
+       {"Flash", SKINNY_LAMP_FLASH},
+       {"Blink", SKINNY_LAMP_BLINK},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_lamp_mode2str, SKINNY_LAMP_MODES, "Unknown")
+SKINNY_DECLARE_STR2ID(skinny_str2lamp_mode, SKINNY_LAMP_MODES, -1)
+
+struct skinny_table SKINNY_SPEAKER_MODES[] = {
+       {"SpeakerOn", SKINNY_SPEAKER_ON},
+       {"SpeakerOff", SKINNY_SPEAKER_OFF},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_speaker_mode2str, SKINNY_SPEAKER_MODES, "Unknown")
+SKINNY_DECLARE_STR2ID(skinny_str2speaker_mode, SKINNY_SPEAKER_MODES, -1)
+
+struct skinny_table SKINNY_KEY_SETS[] = {
+       {"KeySetOnHook", SKINNY_KEY_SET_ON_HOOK},
+       {"KeySetConnected", SKINNY_KEY_SET_CONNECTED},
+       {"KeySetOnHold", SKINNY_KEY_SET_ON_HOLD},
+       {"KeySetRingIn", SKINNY_KEY_SET_RING_IN},
+       {"KeySetOffHook", SKINNY_KEY_SET_OFF_HOOK},
+       {"KeySetConnectedWithTransfer", SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER},
+       {"KeySetDigitsAfterDialingFirstDigit", SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT},
+       {"KeySetConnectedWithConference", SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE},
+       {"KeySetRingOut", SKINNY_KEY_SET_RING_OUT},
+       {"KeySetOffHookWithFeatures", SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_soft_key_set2str, SKINNY_KEY_SETS, "UNKNOWN_SOFT_KEY_SET")
+SKINNY_DECLARE_STR2ID(skinny_str2soft_key_set, SKINNY_KEY_SETS, -1)
+
+struct skinny_table SKINNY_CALL_STATES[] = {
+       {"OffHook", SKINNY_OFF_HOOK},
+       {"OnHook", SKINNY_ON_HOOK},
+       {"RingOut", SKINNY_RING_OUT},
+       {"RingIn", SKINNY_RING_IN},
+       {"Connected", SKINNY_CONNECTED},
+       {"Busy", SKINNY_BUSY},
+       {"Congestion", SKINNY_CONGESTION},
+       {"Hold", SKINNY_HOLD},
+       {"CallWaiting", SKINNY_CALL_WAITING},
+       {"CallTransfer", SKINNY_CALL_TRANSFER},
+       {"CallPark", SKINNY_CALL_PARK},
+       {"Proceed", SKINNY_PROCEED},
+       {"CallRemoteMultiline", SKINNY_CALL_REMOTE_MULTILINE},
+       {"InvalidNumber", SKINNY_INVALID_NUMBER},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_call_state2str, SKINNY_CALL_STATES, "CallStateUnknown")
+SKINNY_DECLARE_STR2ID(skinny_str2call_state, SKINNY_CALL_STATES, -1)
+
+struct skinny_table SKINNY_DEVICE_RESET_TYPES[] = {
+       {"DeviceReset", SKINNY_DEVICE_RESET},
+       {"DeviceRestart", SKINNY_DEVICE_RESTART},
+       {NULL, 0}
+};
+SKINNY_DECLARE_ID2STR(skinny_device_reset_type2str, SKINNY_DEVICE_RESET_TYPES, "DeviceResetTypeUnknown")
+SKINNY_DECLARE_STR2ID(skinny_str2device_reset_type, SKINNY_DEVICE_RESET_TYPES, -1)
+
diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.h b/src/mod/endpoints/mod_skinny/skinny_tables.h
new file mode 100644 (file)
index 0000000..5672446
--- /dev/null
@@ -0,0 +1,237 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2010, Mathieu Parent <math.parent@gmail.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
+ * Mathieu Parent <math.parent@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Mathieu Parent <math.parent@gmail.com>
+ *
+ *
+ * skinny_tables.h -- Skinny Call Control Protocol (SCCP) Endpoint Module
+ *
+ */
+#ifndef _SKINNY_TABLES_H
+#define _SKINNY_TABLES_H
+
+/*****************************************************************************/
+/* SKINNY TABLES */
+/*****************************************************************************/
+struct skinny_table {
+       const char *name;
+       uint32_t id;
+};
+
+#define SKINNY_DECLARE_ID2STR(func, TABLE, DEFAULT_STR) \
+const char *func(uint32_t id) \
+{ \
+       const char *str = DEFAULT_STR; \
+       \
+       for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
+               if (TABLE[x].id == id) {\
+                       str = TABLE[x].name;\
+                       break;\
+               }\
+       }\
+       \
+       return str;\
+}
+
+#define SKINNY_DECLARE_STR2ID(func, TABLE, DEFAULT_ID) \
+uint32_t func(const char *str)\
+{\
+       uint32_t id = DEFAULT_ID;\
+       \
+       if (*str > 47 && *str < 58) {\
+               id = atoi(str);\
+       } else {\
+               for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1 && TABLE[x].name; x++) {\
+                       if (!strcasecmp(TABLE[x].name, str)) {\
+                               id = TABLE[x].id;\
+                               break;\
+                       }\
+               }\
+       }\
+       return id;\
+}
+
+#define SKINNY_DECLARE_PUSH_MATCH(TABLE) \
+       switch_console_callback_match_t *my_matches = NULL;\
+       for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
+               switch_console_push_match(&my_matches, TABLE[x].name);\
+       }\
+       if (my_matches) {\
+               *matches = my_matches;\
+               status = SWITCH_STATUS_SUCCESS;\
+       }
+       
+
+struct skinny_table SKINNY_MESSAGE_TYPES[55];
+const char *skinny_message_type2str(uint32_t id);
+uint32_t skinny_str2message_type(const char *str);
+#define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES)
+
+enum skinny_tone {
+       SKINNY_TONE_SILENCE = 0x00,
+       SKINNY_TONE_DIALTONE = 0x21,
+       SKINNY_TONE_BUSYTONE = 0x23,
+       SKINNY_TONE_ALERT = 0x24,
+       SKINNY_TONE_REORDER = 0x25,
+       SKINNY_TONE_CALLWAITTONE = 0x2D,
+       SKINNY_TONE_NOTONE = 0x7F,
+};
+
+enum skinny_ring_type {
+       SKINNY_RING_OFF = 1,
+       SKINNY_RING_INSIDE = 2,
+       SKINNY_RING_OUTSIDE = 3,
+       SKINNY_RING_FEATURE = 4
+};
+struct skinny_table SKINNY_RING_TYPES[5];
+const char *skinny_ring_type2str(uint32_t id);
+uint32_t skinny_str2ring_type(const char *str);
+#define SKINNY_PUSH_RING_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_RING_TYPES)
+
+enum skinny_ring_mode {
+       SKINNY_RING_FOREVER = 1,
+       SKINNY_RING_ONCE = 2,
+};
+struct skinny_table SKINNY_RING_MODES[3];
+const char *skinny_ring_mode2str(uint32_t id);
+uint32_t skinny_str2ring_mode(const char *str);
+#define SKINNY_PUSH_RING_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_RING_MODES)
+
+
+enum skinny_lamp_mode {
+       SKINNY_LAMP_OFF = 1,
+       SKINNY_LAMP_ON = 2,
+       SKINNY_LAMP_WINK = 3,
+       SKINNY_LAMP_FLASH = 4,
+       SKINNY_LAMP_BLINK = 5,
+};
+struct skinny_table SKINNY_LAMP_MODES[6];
+const char *skinny_lamp_mode2str(uint32_t id);
+uint32_t skinny_str2lamp_mode(const char *str);
+#define SKINNY_PUSH_LAMP_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_LAMP_MODES)
+
+enum skinny_speaker_mode {
+       SKINNY_SPEAKER_ON = 1,
+       SKINNY_SPEAKER_OFF = 2,
+};
+struct skinny_table SKINNY_SPEAKER_MODES[3];
+const char *skinny_speaker_mode2str(uint32_t id);
+uint32_t skinny_str2speaker_mode(const char *str);
+#define SKINNY_PUSH_SPEAKER_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_SPEAKER_MODES)
+
+enum skinny_call_type {
+       SKINNY_INBOUND_CALL = 1,
+       SKINNY_OUTBOUND_CALL = 2,
+       SKINNY_FORWARD_CALL = 3,
+};
+
+enum skinny_button_definition {
+       SKINNY_BUTTON_UNKNOWN = 0x00,
+       SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
+       SKINNY_BUTTON_SPEED_DIAL = 0x02,
+       SKINNY_BUTTON_LINE = 0x09,
+       SKINNY_BUTTON_VOICEMAIL = 0x0F,
+       SKINNY_BUTTON_PRIVACY = 0x13,
+       SKINNY_BUTTON_SERVICE_URL = 0x14,
+       SKINNY_BUTTON_UNDEFINED = 0xFF,
+};
+struct skinny_table SKINNY_BUTTONS[9];
+const char *skinny_button2str(uint32_t id);
+uint32_t skinny_str2button(const char *str);
+#define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS)
+
+enum skinny_soft_key_event {
+       SOFTKEY_REDIAL = 0x01,
+       SOFTKEY_NEWCALL = 0x02,
+       SOFTKEY_HOLD = 0x03,
+       SOFTKEY_TRANSFER = 0x04,
+       SOFTKEY_CFWDALL = 0x05,
+       SOFTKEY_CFWDBUSY = 0x06,
+       SOFTKEY_CFWDNOANSWER = 0x07,
+       SOFTKEY_BACKSPACE = 0x08,
+       SOFTKEY_ENDCALL = 0x09,
+       SOFTKEY_RESUME = 0x0A,
+       SOFTKEY_ANSWER = 0x0B,
+       SOFTKEY_INFO = 0x0C,
+       SOFTKEY_CONFRM = 0x0D,
+       SOFTKEY_PARK = 0x0E,
+       SOFTKEY_JOIN = 0x0F,
+       SOFTKEY_MEETMECONFRM = 0x10,
+       SOFTKEY_CALLPICKUP = 0x11,
+       SOFTKEY_GRPCALLPICKUP = 0x12,
+       SOFTKEY_DND = 0x13,
+       SOFTKEY_IDIVERT = 0x14,
+};
+
+enum skinny_key_set {
+       SKINNY_KEY_SET_ON_HOOK = 0,
+       SKINNY_KEY_SET_CONNECTED = 1,
+       SKINNY_KEY_SET_ON_HOLD = 2,
+       SKINNY_KEY_SET_RING_IN = 3,
+       SKINNY_KEY_SET_OFF_HOOK = 4,
+       SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER = 5,
+       SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT = 6,
+       SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE = 7,
+       SKINNY_KEY_SET_RING_OUT = 8,
+       SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES = 9,
+};
+struct skinny_table SKINNY_KEY_SETS[11];
+const char *skinny_soft_key_set2str(uint32_t id);
+uint32_t skinny_str2soft_key_set(const char *str);
+#define SKINNY_PUSH_SOFT_KEY_SETS SKINNY_DECLARE_PUSH_MATCH(SKINNY_KEY_SETS)
+
+
+enum skinny_call_state {
+       SKINNY_OFF_HOOK = 1,
+       SKINNY_ON_HOOK = 2,
+       SKINNY_RING_OUT = 3,
+       SKINNY_RING_IN = 4,
+       SKINNY_CONNECTED = 5,
+       SKINNY_BUSY = 6,
+       SKINNY_CONGESTION = 7,
+       SKINNY_HOLD = 8,
+       SKINNY_CALL_WAITING = 9,
+       SKINNY_CALL_TRANSFER = 10,
+       SKINNY_CALL_PARK = 11,
+       SKINNY_PROCEED = 12,
+       SKINNY_CALL_REMOTE_MULTILINE = 13,
+       SKINNY_INVALID_NUMBER = 14
+};
+struct skinny_table SKINNY_CALL_STATES[15];
+const char *skinny_call_state2str(uint32_t id);
+uint32_t skinny_str2call_state(const char *str);
+#define SKINNY_PUSH_CALL_STATES SKINNY_DECLARE_PUSH_MATCH(SKINNY_CALL_STATES)
+
+enum skinny_device_reset_types {
+  SKINNY_DEVICE_RESET = 1,
+  SKINNY_DEVICE_RESTART = 2
+};
+struct skinny_table SKINNY_DEVICE_RESET_TYPES[3];
+const char *skinny_device_reset_type2str(uint32_t id);
+uint32_t skinny_str2device_reset_type(const char *str);
+#define SKINNY_PUSH_DEVICE_RESET_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_DEVICE_RESET_TYPES)
+
+#endif /* _SKINNY_TABLES_H */
+