Skinny: incomplete support for DialedPhoneBookMessage

diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.h b/src/mod/endpoints/mod_skinny/skinny_protocol.h
index 8f8911f2a73491071a7d93accec41d800e425758..eff0091c07e66d1d05d22f0d1d0e5b2f0a16f2ad 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_protocol.h
+++ b/src/mod/endpoints/mod_skinny/skinny_protocol.h
@@ -234,6 +234,15 @@ struct PACKED extended_data_message {
 #define DEVICE_TO_USER_DATA_RESPONSE_VERSION1_MESSAGE 0x0042
 /* See struct PACKED extended_data_message */
 
+/* DialedPhoneBookMessage */
+#define DIALED_PHONE_BOOK_MESSAGE 0x0048
+struct PACKED dialed_phone_book_message {
+       uint32_t number_index; /* must be shifted 4 bits right */
+       uint32_t line_instance;
+       uint32_t unknown;
+       char phone_number[256];
+};
+
 /* RegisterAckMessage */
 #define REGISTER_ACK_MESSAGE 0x0081
 struct PACKED register_ack_message {
@@ -507,7 +516,7 @@ struct PACKED display_prompt_status_message {
 };
 
 /* ClearPromptStatusMessage */
-#define CLEAR_PROMPT_STATUS_MESSAGE  0x0113
+#define CLEAR_PROMPT_STATUS_MESSAGE 0x0113
 struct PACKED clear_prompt_status_message {
     uint32_t line_instance;
     uint32_t call_id;
@@ -573,6 +582,15 @@ struct PACKED service_url_stat_res_message {
 #define USER_TO_DEVICE_DATA_VERSION1_MESSAGE 0x013F
 /* See struct PACKED extended_data_message */
 
+/* DialedPhoneBookAckMessage */
+#define DIALED_PHONE_BOOK_ACK_MESSAGE 0x0152
+struct PACKED dialed_phone_book_ack_message {
+       uint32_t number_index; /* must be shifted 4 bits right */
+       uint32_t line_instance;
+       uint32_t unknown;
+       uint32_t unknown2;
+};
+
 /* XMLAlarmMessage */
 #define XML_ALARM_MESSAGE 0x015A
 
@@ -614,6 +632,7 @@ union skinny_data {
        struct feature_stat_req_message feature_req;
        /* see field "extended_data" for DEVICE_TO_USER_DATA_VERSION1_MESSAGE */
        /* see field "extended_data" for DEVICE_TO_USER_DATA_RESPONSE_VERSION1_MESSAGE */
+       struct dialed_phone_book_message dialed_phone_book;
        struct register_ack_message reg_ack;
        struct start_tone_message start_tone;
        struct stop_tone_message stop_tone;
@@ -651,6 +670,7 @@ union skinny_data {
        struct display_pri_notify_message display_pri_notify;
        struct service_url_stat_res_message service_url_res;
        /* see field "extended_data" for USER_TO_DEVICE_DATA_VERSION1_MESSAGE */
+       struct dialed_phone_book_ack_message dialed_phone_book_ack;
 
        struct data_message data;
        struct extended_data_message extended_data;

diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index 2c338d6ce562f55dbf739bdac78931edb2f22230..12c83b846abaca804a6fab954d6263c89292eb25 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -2012,6 +2012,22 @@ switch_status_t skinny_handle_extended_data_message(listener_t *listener, skinny
 
        return SWITCH_STATUS_SUCCESS;
 }
+switch_status_t skinny_handle_dialed_phone_book_message(listener_t *listener, skinny_message_t *request)
+{
+       skinny_message_t *message;
+
+       skinny_check_data_length(request, sizeof(request->data.dialed_phone_book));
+
+       message = switch_core_alloc(listener->pool, 12+sizeof(message->data.dialed_phone_book_ack));
+       message->type = DIALED_PHONE_BOOK_ACK_MESSAGE;
+       message->length = 4 + sizeof(message->data.dialed_phone_book_ack);
+       message->data.dialed_phone_book_ack.number_index = request->data.dialed_phone_book.number_index;
+       message->data.dialed_phone_book_ack.line_instance = request->data.dialed_phone_book.line_instance;
+       message->data.dialed_phone_book_ack.unknown = request->data.dialed_phone_book.unknown;
+       message->data.dialed_phone_book_ack.unknown2 = 0;
+
+       return SWITCH_STATUS_SUCCESS;
+}
 
 switch_status_t skinny_handle_xml_alarm(listener_t *listener, skinny_message_t *request)
 {
@@ -2106,6 +2122,8 @@ switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *re
                        return skinny_handle_extended_data_message(listener, request);
                case DEVICE_TO_USER_DATA_RESPONSE_VERSION1_MESSAGE:
                        return skinny_handle_extended_data_message(listener, request);
+               case DIALED_PHONE_BOOK_MESSAGE:
+                       return skinny_handle_dialed_phone_book_message(listener, request);
                case XML_ALARM_MESSAGE:
                        return skinny_handle_xml_alarm(listener, request);
                default:

diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.c b/src/mod/endpoints/mod_skinny/skinny_tables.c
index 04237ad3ea73f7f747f0af3a84966525717d82c1..5a627dba0b63da3021778c3a96efc5659c578d60 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_tables.c
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.c
@@ -65,6 +65,7 @@ struct skinny_table SKINNY_MESSAGE_TYPES[] = {
        {FEATURE_STAT_REQ_MESSAGE, "FeatureStatReqMessage"},
        {DEVICE_TO_USER_DATA_VERSION1_MESSAGE, "DeviceToUserDataVersion1Message"},
        {DEVICE_TO_USER_DATA_RESPONSE_VERSION1_MESSAGE, "DeviceToUserDataResponseVersion1Message"},
+       {DIALED_PHONE_BOOK_MESSAGE, "DialedPhoneBookMessage"},
        {REGISTER_ACK_MESSAGE, "RegisterAckMessage"},
        {START_TONE_MESSAGE, "StartToneMessage"},
        {STOP_TONE_MESSAGE, "StopToneMessage"},
@@ -102,6 +103,7 @@ struct skinny_table SKINNY_MESSAGE_TYPES[] = {
        {DISPLAY_PRI_NOTIFY_MESSAGE, "DisplayPriNotifyMessage"},
        {SERVICE_URL_STAT_RES_MESSAGE, "ServiceUrlStatMessage"},
        {USER_TO_DEVICE_DATA_VERSION1_MESSAGE, "UserToDeviceDataVersion1Message"},
+       {DIALED_PHONE_BOOK_ACK_MESSAGE, "DialedPhoneBookAckMessage"},
        {XML_ALARM_MESSAGE, "XMLAlarmMessage"},
        {0, NULL}
 };

diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.h b/src/mod/endpoints/mod_skinny/skinny_tables.h
index abfdfc2aa087cecb98d305b5e26aa879f1174dd5..0e0c9b1b5b105d8b2ca482b5613f3b706e6a504b 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_tables.h
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.h
@@ -87,7 +87,7 @@ uint32_t func(const char *str)\
     }
 
 
-extern struct skinny_table SKINNY_MESSAGE_TYPES[69];
+extern struct skinny_table SKINNY_MESSAGE_TYPES[71];
 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)