add a few additional skinny message types

diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.h b/src/mod/endpoints/mod_skinny/skinny_protocol.h
index d3b84ffabc63f7181dc3706e4e6fd258b80baedd..f4f89f4c6bb43128613ccbda3e5f61ffeca396e0 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_protocol.h
+++ b/src/mod/endpoints/mod_skinny/skinny_protocol.h
@@ -145,6 +145,8 @@ struct PACKED capabilities_res_message {
        struct station_capabilities caps[SWITCH_MAX_CODECS];
 };
 
+#define SERVER_REQ_MESSAGE 0x0012
+
 /* AlarmMessage */
 #define ALARM_MESSAGE 0x0020
 struct PACKED alarm_message {
@@ -207,6 +209,8 @@ struct PACKED data_message {
 #define DEVICE_TO_USER_DATA_RESPONSE_MESSAGE 0x002F
 /* See struct PACKED data_message */
 
+#define DEVICE_UPDATECAPABILITIES 0x0030
+
 /* ServiceUrlStatReqMessage */
 #define SERVICE_URL_STAT_REQ_MESSAGE 0x0033
 struct PACKED service_url_stat_req_message {
@@ -442,6 +446,8 @@ struct PACKED register_reject_message {
        char error[33];
 };
 
+#define SERVER_RESPONSE_MESSAGE 0x009E
+
 /* ResetMessage */
 #define RESET_MESSAGE 0x009F
 struct PACKED reset_message {
@@ -723,6 +729,8 @@ typedef struct skinny_message skinny_message_t;
 /* SKINNY TYPES */
 /*****************************************************************************/
 enum skinny_codecs {
+       SKINNY_CODEC_NONE = 0,
+       SKINNY_CODEC_NONSTANDARD = 1,
        SKINNY_CODEC_ALAW_64K = 2,
        SKINNY_CODEC_ALAW_56K = 3,
        SKINNY_CODEC_ULAW_64K = 4,
@@ -744,6 +752,8 @@ enum skinny_codecs {
        SKINNY_CODEC_WIDEBAND_256K = 25,
        SKINNY_CODEC_DATA_64K = 32,
        SKINNY_CODEC_DATA_56K = 33,
+       SKINNY_CODEC_G722_1_32K = 40,
+       SKINNY_CODEC_G722_1_24K = 41,
        SKINNY_CODEC_GSM = 80,
        SKINNY_CODEC_ACTIVEVOICE = 81,
        SKINNY_CODEC_G726_32K = 82,
@@ -754,6 +764,7 @@ enum skinny_codecs {
        SKINNY_CODEC_H261 = 100,
        SKINNY_CODEC_H263 = 101,
        SKINNY_CODEC_VIDEO = 102,
+       SKINNY_CODEC_H264 = 103,
        SKINNY_CODEC_T120 = 105,
        SKINNY_CODEC_H224 = 106,
        SKINNY_CODEC_RFC2833_DYNPAYLOAD = 257

diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.c b/src/mod/endpoints/mod_skinny/skinny_tables.c
index e896245955c3bf8a4ba1cee6c904ef351ba180d1..7a7027b049b2200a67482567bb1e920f725aed8e 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_tables.c
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.c
@@ -61,6 +61,7 @@ struct skinny_table SKINNY_MESSAGE_TYPES[] = {
        {REGISTER_AVAILABLE_LINES_MESSAGE, "RegisterAvailableLinesMessage"},
        {DEVICE_TO_USER_DATA_MESSAGE, "DeviceToUserDataMessage"},
        {DEVICE_TO_USER_DATA_RESPONSE_MESSAGE, "DeviceToUserDataResponseMessage"},
+       {DEVICE_UPDATECAPABILITIES, "DeviceUpdateCapabilities"},
        {SERVICE_URL_STAT_REQ_MESSAGE, "ServiceUrlStatReqMessage"},
        {FEATURE_STAT_REQ_MESSAGE, "FeatureStatReqMessage"},
        {DEVICE_TO_USER_DATA_VERSION1_MESSAGE, "DeviceToUserDataVersion1Message"},
@@ -84,7 +85,9 @@ struct skinny_table SKINNY_MESSAGE_TYPES[] = {
        {BUTTON_TEMPLATE_RES_MESSAGE, "ButtonTemplateResMessage"},
        {VERSION_MESSAGE, "VersionMessage"},
        {CAPABILITIES_REQ_MESSAGE, "CapabilitiesReqMessage"},
+       {SERVER_REQ_MESSAGE, "Server Request Message"},
        {REGISTER_REJECT_MESSAGE, "RegisterRejectMessage"},
+       {SERVER_RESPONSE_MESSAGE, "ServerResponseMessage"},
        {RESET_MESSAGE, "ResetMessage"},
        {KEEP_ALIVE_ACK_MESSAGE, "KeepAliveAckMessage"},
        {OPEN_RECEIVE_CHANNEL_MESSAGE, "OpenReceiveChannelMessage"},

diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.h b/src/mod/endpoints/mod_skinny/skinny_tables.h
index b4b1e1bb6656a3b9a496ea468623ac79261d804e..1e35a7d2085d2ed0c91aff038e246c1f9cad4ccb 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_tables.h
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.h
@@ -87,7 +87,7 @@ if (my_matches) {\
 }
 
 
-extern struct skinny_table SKINNY_MESSAGE_TYPES[72];
+extern struct skinny_table SKINNY_MESSAGE_TYPES[75];
 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)