diff --git a/trunk/tinySAK/src/tsk_fsm.c b/trunk/tinySAK/src/tsk_fsm.c index 930c0486..ca6ec314 100644 --- a/trunk/tinySAK/src/tsk_fsm.c +++ b/trunk/tinySAK/src/tsk_fsm.c @@ -39,6 +39,11 @@ int tsk_fsm_exec_nothing(va_list *app){ return 1; } int tsk_fsm_cond_always(const void* data1, const void* data2) { return 1; } /**@ingroup tsk_fsm_group +* Add entries (states) to the FSM. +* @param self The FSM. +* @param ... One of these helper macros: @b TSK_FSM_ADD_*. MUST end with +* @b TSK_FSM_ADD_NULL. +* @retval Zero if succeed and non-zero error code otherwise. */ int tsk_fsm_set(tsk_fsm_t* self, ...) { @@ -70,6 +75,13 @@ int tsk_fsm_set(tsk_fsm_t* self, ...) return 0; } +/**@ingroup tsk_fsm_group +* Sets the @a callback function to call when the FSM enter in the final state. +* @param self The FSM. +* @param callback The callback function to call. +* @param callbackdata Opaque data (user-data) to pass to the callback function. +* @retval Zero if succeed and non-zero error code otherwise. +*/ int tsk_fsm_set_callback_terminated(tsk_fsm_t* self, tsk_fsm_onterminated callback, const void* callbackdata) { if(self){ @@ -81,6 +93,13 @@ int tsk_fsm_set_callback_terminated(tsk_fsm_t* self, tsk_fsm_onterminated callba } /**@ingroup tsk_fsm_group +* Execute an @a action. This action will probably change the current state of the FSM. +* @param self The FSM. +* @param action The id of the action to execute. +* @param cond_data1 The first opaque data to pass to the @a condition function. +* @param cond_data2 The first opaque data to pass to the @a condition function. +* @param ... Variable parameters to pass to the @a exec function. +* @retval Zero if succeed and non-zero error code otherwise. */ int tsk_fsm_act(tsk_fsm_t* self, tsk_fsm_action_id action, const void* cond_data1, const void* cond_data2, ...) { diff --git a/trunk/tinySAK/src/tsk_list.c b/trunk/tinySAK/src/tsk_list.c index 53402b47..24dc97a2 100644 --- a/trunk/tinySAK/src/tsk_list.c +++ b/trunk/tinySAK/src/tsk_list.c @@ -386,8 +386,7 @@ const tsk_list_item_t* tsk_list_find_item_by_pred(const tsk_list_t* list, tsk_li tsk_list_item_t *item; tsk_list_foreach(item, list) { - if(!predicate(item, data)) - { + if(!predicate(item, data)){ return item; } } diff --git a/trunk/tinySAK/src/tsk_params.c b/trunk/tinySAK/src/tsk_params.c index 91165fb0..8b4fff27 100644 --- a/trunk/tinySAK/src/tsk_params.c +++ b/trunk/tinySAK/src/tsk_params.c @@ -100,7 +100,7 @@ int tsk_params_have_param(const tsk_params_L_t *self, const char* name) } /**@ingroup tsk_params_group -* Adds a parameter to the list of parameters. +* Adds a parameter to the list of parameters. If the parameter already exist, then it's value will be updated. * @param self The destination list. * @param name The name of the parameter to add. * @param value The value of the parameter to add. @@ -118,8 +118,13 @@ int tsk_params_add_param(tsk_params_L_t **self, const char* name, const char* va *self = TSK_LIST_CREATE(); } - param = TSK_PARAM_CREATE(name, value); - tsk_list_push_back_data(*self, (void**)¶m); + if((param = (tsk_param_t*)tsk_params_get_param_by_name(*self, name))){ + tsk_strupdate(¶m->value, value); /* Already exist ==> update the value. */ + } + else{ + param = TSK_PARAM_CREATE(name, value); + tsk_list_push_back_data(*self, (void**)¶m); + } return 0; } diff --git a/trunk/tinySAK/tinySAK.tag b/trunk/tinySAK/tinySAK.tag index 22b07cc2..85fe9bdb 100644 --- a/trunk/tinySAK/tinySAK.tag +++ b/trunk/tinySAK/tinySAK.tag @@ -657,8 +657,8 @@ int tsk_fsm_set_callback_terminated - tsk__fsm_8c.html - af522979f49aaac6acbf7d5ef5712776f + group__tsk__fsm__group.html + gaf522979f49aaac6acbf7d5ef5712776f (tsk_fsm_t *self, tsk_fsm_onterminated callback, const void *callbackdata) @@ -870,8 +870,8 @@ TINYSAK_API int tsk_fsm_set_callback_terminated - tsk__fsm_8h.html - a5ae65679e4a53f3f672560b3c30097b4 + group__tsk__fsm__group.html + gaf522979f49aaac6acbf7d5ef5712776f (tsk_fsm_t *self, tsk_fsm_onterminated callback, const void *callbackdata) @@ -4025,6 +4025,13 @@ ga9059c5c9cdccf14f4c963bfee38b5ba4 (tsk_fsm_t *self,...) + + int + tsk_fsm_set_callback_terminated + group__tsk__fsm__group.html + gaf522979f49aaac6acbf7d5ef5712776f + (tsk_fsm_t *self, tsk_fsm_onterminated callback, const void *callbackdata) + int tsk_fsm_act diff --git a/trunk/tinySIP/include/tinysip/api/tsip_api_message.h b/trunk/tinySIP/include/tinysip/api/tsip_api_message.h index 4529d5d4..1a2dcbf8 100644 --- a/trunk/tinySIP/include/tinysip/api/tsip_api_message.h +++ b/trunk/tinySIP/include/tinysip/api/tsip_api_message.h @@ -57,8 +57,6 @@ tsip_message_event_t; int tsip_message_event_signal(tsip_message_event_type_t type, struct tsip_stack_s *stack, tsip_operation_id_t opid, short status_code, const char *phrase, const struct tsip_message_s* sipmessage); -typedef int (*tsip_message_callback)(const tsip_message_event_t *sipevent); - TINYSIP_GEXTERN const void *tsip_message_event_def_t; TSIP_END_DECLS diff --git a/trunk/tinySIP/include/tinysip/api/tsip_api_publish.h b/trunk/tinySIP/include/tinysip/api/tsip_api_publish.h index e69de29b..0f6edbda 100644 --- a/trunk/tinySIP/include/tinysip/api/tsip_api_publish.h +++ b/trunk/tinySIP/include/tinysip/api/tsip_api_publish.h @@ -0,0 +1,69 @@ +/* +* Copyright (C) 2009 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ + +/**@file tsip_api_publish.h + * @brief Public piblication (PUBLISH) functions. + * + * @author Mamadou Diop + * + * @date Created: Sat Nov 8 16:54:58 2009 mdiop + */ +#ifndef TINYSIP_TSIP_PUBLISH_H +#define TINYSIP_TSIP_PUBLISH_H + +#include "tinysip_config.h" + +#include "tinysip/tsip_event.h" + +TSIP_BEGIN_DECLS + +#define TSIP_PUBLISH_EVENT(self) ((tsip_publish_event_t*)(self)) + +typedef enum tsip_publish_event_type_e +{ + tsip_i_publish, + tsip_ai_publish, + tsip_o_publish, + tsip_ao_publish, + + tsip_i_unpublish, + tsip_ai_unpublish, + tsip_o_unpublish, + tsip_ao_unpublish +} +tsip_publish_event_type_t; + +typedef struct tsip_publish_event_e +{ + TSIP_DECLARE_EVENT; + + tsip_publish_event_type_t type; +} +tsip_publish_event_t; + +int tsip_publish_event_signal(tsip_publish_event_type_t type, struct tsip_stack_s *stack, tsip_operation_id_t opid, short status_code, const char *phrase, const struct tsip_message_s* sipmessage); + +TINYSIP_GEXTERN const void *tsip_publish_event_def_t; + +TSIP_END_DECLS + +#endif /* TINYSIP_TSIP_PUBLISH_H */ diff --git a/trunk/tinySIP/include/tinysip/api/tsip_api_register.h b/trunk/tinySIP/include/tinysip/api/tsip_api_register.h index 27eb26b8..5353d58f 100644 --- a/trunk/tinySIP/include/tinysip/api/tsip_api_register.h +++ b/trunk/tinySIP/include/tinysip/api/tsip_api_register.h @@ -62,8 +62,6 @@ tsip_register_event_t; int tsip_register_event_signal(tsip_register_event_type_t type, struct tsip_stack_s *stack, tsip_operation_id_t opid, short status_code, const char *phrase, const struct tsip_message_s* sipmessage); -typedef int (*tsip_register_callback)(const tsip_register_event_t *sipevent); - TINYSIP_GEXTERN const void *tsip_register_event_def_t; TSIP_END_DECLS diff --git a/trunk/tinySIP/include/tinysip/api/tsip_api_subscribe.h b/trunk/tinySIP/include/tinysip/api/tsip_api_subscribe.h index dcfa655c..301aa5cd 100644 --- a/trunk/tinySIP/include/tinysip/api/tsip_api_subscribe.h +++ b/trunk/tinySIP/include/tinysip/api/tsip_api_subscribe.h @@ -67,8 +67,6 @@ tsip_subscribe_event_t; int tsip_subscribe_event_signal(tsip_subscribe_event_type_t type, struct tsip_stack_s *stack, tsip_operation_id_t opid, short status_code, const char *phrase, const struct tsip_message_s* sipmessage); -typedef int (*tsip_subscribe_callback)(const tsip_subscribe_event_t *sipevent); - TINYSIP_GEXTERN const void *tsip_subscribe_event_def_t; TSIP_END_DECLS diff --git a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h index 9ccd62a0..26e78316 100644 --- a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h +++ b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h @@ -41,6 +41,17 @@ TSIP_BEGIN_DECLS #define TSIP_DIALOG_PUBLISH(self) ((tsip_dialog_publish_t*)(self)) +/** Type of refresh to perform. +*/ +typedef enum refresh_type_e +{ + rt_initial, + rt_timedout, + rt_modify, + rt_remove +} +refresh_type_t; + typedef struct tsip_dialog_publish { TSIP_DECLARE_DIALOG; @@ -50,12 +61,14 @@ typedef struct tsip_dialog_publish tsip_timer_t timerrefresh; unsigned unpublishing:1; - - char* package; + char* etag; + refresh_type_t last_rtype; } tsip_dialog_publish_t; int tsip_dialog_publish_start(tsip_dialog_publish_t *self); +int tsip_dialog_publish_modify(tsip_dialog_publish_t *self); +int tsip_dialog_publish_remove(tsip_dialog_publish_t *self); TINYSIP_GEXTERN const void *tsip_dialog_publish_def_t; diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h index 5c625f59..8a6a78fb 100644 --- a/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h +++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h @@ -35,22 +35,34 @@ TSIP_BEGIN_DECLS -//////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct -/// -/// @brief SIP header 'SIP-ETag'. -/// @author Mamadou -/// @date 12/3/2009 -/// -/// @par ABNF -/// -//////////////////////////////////////////////////////////////////////////////////////////////////// +/**@def TSIP_HEADER_SIP_ETAG_CREATE +* Creates new sip 'SIP-ETag' header as per RFC 3903. You must call @ref TSK_OBJECT_SAFE_FREE to free the header. +* @sa TSK_OBJECT_SAFE_FREE. +*/ +#define TSIP_HEADER_SIP_ETAG_VA_ARGS(etag) tsip_header_SIP_ETag_def_t, (const char*)etag +#define TSIP_HEADER_SIP_ETAG_CREATE(etag) tsk_object_new(TSIP_HEADER_SIP_ETAG_VA_ARGS(etag)) +#define TSIP_HEADER_SIP_ETAG_CREATE_NULL() TSIP_HEADER_SIP_ETAG_CREATE(TSIP_NULL) + + +/** + * @struct tsip_header_SIP_ETag_s + * + * SIP header 'SIP-ETag' as per RFC 3903. + * @par ABNF + * SIP-ETag = "SIP-ETag" HCOLON entity-tag + * entity-tag = token +**/ typedef struct tsip_header_SIP_ETag_s { TSIP_DECLARE_HEADER; + char *value; } tsip_header_SIP_ETag_t; +tsip_header_SIP_ETag_t *tsip_header_SIP_ETag_parse(const char *data, size_t size); + +TINYSIP_GEXTERN const void *tsip_header_SIP_ETag_def_t; + TSIP_END_DECLS #endif /* _TSIP_HEADER_SIP_ETAG_H_ */ diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h index 28f18e7c..dfeb917b 100644 --- a/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h +++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h @@ -35,22 +35,34 @@ TSIP_BEGIN_DECLS -//////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct -/// -/// @brief SIP header 'SIP-If-Match'. -/// @author Mamadou -/// @date 12/3/2009 -/// -/// @par ABNF -/// -//////////////////////////////////////////////////////////////////////////////////////////////////// +/**@def TSIP_HEADER_SIP_IF_MATCH_CREATE +* Creates new sip 'SIP-If-Match' header as per RFC 3903. You must call @ref TSK_OBJECT_SAFE_FREE to free the header. +* @sa TSK_OBJECT_SAFE_FREE. +*/ +#define TSIP_HEADER_SIP_IF_MATCH_VA_ARGS(etag) tsip_header_SIP_If_Match_def_t, (const char*)etag +#define TSIP_HEADER_SIP_IF_MATCH_CREATE(etag) tsk_object_new(TSIP_HEADER_SIP_IF_MATCH_VA_ARGS(etag)) +#define TSIP_HEADER_SIP_IF_MATCH_CREATE_NULL() TSIP_HEADER_SIP_IF_MATCH_CREATE(TSIP_NULL) + + +/** + * @struct tsip_header_SIP_If_Match_s + * + * SIP header 'SIP-If-Match' as per RFC 3903. + * @par ABNF + * SIP-If-Match = "SIP-If-Match" HCOLON entity-tag + * entity-tag = token +**/ typedef struct tsip_header_SIP_If_Match_s { TSIP_DECLARE_HEADER; + char *value; } tsip_header_SIP_If_Match_t; +tsip_header_SIP_If_Match_t *tsip_header_SIP_If_Match_parse(const char *data, size_t size); + +TINYSIP_GEXTERN const void *tsip_header_SIP_If_Match_def_t; + TSIP_END_DECLS #endif /* _TSIP_HEADER_SIP_IF_MATCH_H_ */ diff --git a/trunk/tinySIP/include/tinysip/tsip_operation.h b/trunk/tinySIP/include/tinysip/tsip_operation.h index 7d1429e1..ff72cf8d 100644 --- a/trunk/tinySIP/include/tinysip/tsip_operation.h +++ b/trunk/tinySIP/include/tinysip/tsip_operation.h @@ -67,6 +67,7 @@ tsip_operation_handle_t *tsip_operation_createex(const struct tsip_message_s* me TINYSIP_API int tsip_operation_set(tsip_operation_handle_t *self, ...); TINYSIP_API tsip_operation_id_t tsip_operation_get_id(const tsip_operation_handle_t *self); const tsk_param_t* tsip_operation_get_param(const tsip_operation_handle_t *self, const char* pname); +const tsk_param_t* tsip_operation_get_header(const tsip_operation_handle_t *self, const char* pname); const tsk_params_L_t* tsip_operation_get_headers(const tsip_operation_handle_t *self); const tsk_params_L_t* tsip_operation_get_params(const tsip_operation_handle_t *self); const tsk_params_L_t* tsip_operation_get_caps(const tsip_operation_handle_t *self); diff --git a/trunk/tinySIP/include/tsip.h b/trunk/tinySIP/include/tsip.h index 012963ca..00e1176f 100644 --- a/trunk/tinySIP/include/tsip.h +++ b/trunk/tinySIP/include/tsip.h @@ -220,10 +220,15 @@ const struct tsip_transac_layer_s* tsip_stack_get_transac_layer(const tsip_stack const struct tsip_transport_layer_s* tsip_stack_get_transport_layer(const tsip_stack_handle_t *self); TINYSIP_API int tsip_register(tsip_stack_handle_t *stack, const tsip_operation_handle_t *operation); -int tsip_unregister(tsip_stack_handle_t *stack, const tsip_operation_handle_t *operation); +TINYSIP_API int tsip_unregister(tsip_stack_handle_t *stack, const tsip_operation_handle_t *operation); TINYSIP_API int tsip_subscribe(tsip_stack_handle_t *stack, const tsip_operation_handle_t *operation); -int tsip_unsubscribe(tsip_stack_handle_t *stack, const tsip_operation_handle_t *operation); +TINYSIP_API int tsip_unsubscribe(tsip_stack_handle_t *stack, const tsip_operation_handle_t *operation); + +TINYSIP_API int tsip_publish(tsip_stack_handle_t *_stack, const tsip_operation_handle_t *operation); +TINYSIP_API int tsip_publish_modify(tsip_stack_handle_t *_stack, const tsip_operation_handle_t *operation); +TINYSIP_API int tsip_publish_remove(tsip_stack_handle_t *_stack, const tsip_operation_handle_t *operation); + TINYSIP_API int tsip_message(tsip_stack_handle_t *stack, const tsip_operation_handle_t *operation); diff --git a/trunk/tinySIP/ragel.sh b/trunk/tinySIP/ragel.sh index 03da8607..a154cfec 100644 --- a/trunk/tinySIP/ragel.sh +++ b/trunk/tinySIP/ragel.sh @@ -95,6 +95,12 @@ ragel.exe $OPTIONS -o ../src/headers/tsip_header_Require.c tsip_parser_header_Re # == Server ragel.exe $OPTIONS -o ../src/headers/tsip_header_Server.c tsip_parser_header_Server.rl +# == SIP-ETag +ragel.exe $OPTIONS -o ../src/headers/tsip_header_SIP_ETag.c tsip_parser_header_SIP_ETag.rl + +# == SIP-If-Match +ragel.exe $OPTIONS -o ../src/headers/tsip_header_SIP_If_Match.c tsip_parser_header_SIP_If_Match.rl + # == Route ragel.exe $OPTIONS -o ../src/headers/tsip_header_Route.c tsip_parser_header_Route.rl diff --git a/trunk/tinySIP/ragel/tsip_parser_header.rl b/trunk/tinySIP/ragel/tsip_parser_header.rl index ad887a28..65c5d304 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header.rl @@ -58,6 +58,8 @@ #include "tinysip/headers/tsip_header_Security_Verify.h" #include "tinysip/headers/tsip_header_Server.h" #include "tinysip/headers/tsip_header_Service_Route.h" +#include "tinysip/headers/tsip_header_SIP_ETag.h" +#include "tinysip/headers/tsip_header_SIP_If_Match.h" #include "tinysip/headers/tsip_header_Subscription_State.h" #include "tinysip/headers/tsip_header_Supported.h" #include "tinysip/headers/tsip_header_To.h" @@ -635,13 +637,15 @@ # /*== SIP-ETag: ==*/ action parse_header_SIP_ETag { - TSK_DEBUG_ERROR("parse_header_SIP_ETag NOT IMPLEMENTED"); + tsip_header_SIP_ETag_t *header = tsip_header_SIP_ETag_parse(state->tag_start, (state->tag_end-state->tag_start)); + ADD_HEADER(header); } # /*== SIP-If-Match: ==*/ action parse_header_SIP_If_Match { - TSK_DEBUG_ERROR("parse_header_SIP_If_Match NOT IMPLEMENTED"); + tsip_header_SIP_If_Match_t *header = tsip_header_SIP_If_Match_parse(state->tag_start, (state->tag_end-state->tag_start)); + ADD_HEADER(header); } # /*== Subject: ==*/ diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Allow.rl b/trunk/tinySIP/ragel/tsip_parser_header_Allow.rl index 5dae9a9e..b99e3cdc 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Allow.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Allow.rl @@ -128,8 +128,6 @@ tsip_header_Allow_t *tsip_header_Allow_parse(const char *data, size_t size) // Allow header object definition // -/**@ingroup tsip_header_Allow_group -*/ static void* tsip_header_Allow_create(void *self, va_list * app) { tsip_header_Allow_t *Allow = self; @@ -150,8 +148,6 @@ static void* tsip_header_Allow_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Allow_group -*/ static void* tsip_header_Allow_destroy(void *self) { tsip_header_Allow_t *Allow = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Allow_Events.rl b/trunk/tinySIP/ragel/tsip_parser_header_Allow_Events.rl index 20fffa70..34565006 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Allow_Events.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Allow_Events.rl @@ -134,8 +134,6 @@ tsip_header_Allow_Events_t *tsip_header_Allow_Events_parse(const char *data, siz // Allow_events header object definition // -/**@ingroup tsip_header_Allow_events_group -*/ static void* tsip_header_Allow_Events_create(void *self, va_list * app) { tsip_header_Allow_Events_t *Allow_events = self; @@ -151,8 +149,6 @@ static void* tsip_header_Allow_Events_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Allow_events_group -*/ static void* tsip_header_Allow_Events_destroy(void *self) { tsip_header_Allow_Events_t *Allow_events = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Authorization.rl b/trunk/tinySIP/ragel/tsip_parser_header_Authorization.rl index e4ba6991..db477e45 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Authorization.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Authorization.rl @@ -237,8 +237,6 @@ //// Authorization header object definition //// // -///**@ingroup tsip_header_Authorization_group -//*/ //static void* tsip_header_Authorization_create(void *self, va_list * app) //{ // tsip_header_Authorization_t *Authorization = self; @@ -254,8 +252,6 @@ // return self; //} // -///**@ingroup tsip_header_Authorization_group -//*/ //static void* tsip_header_Authorization_destroy(void *self) //{ // tsip_header_Authorization_t *Authorization = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_CSeq.rl b/trunk/tinySIP/ragel/tsip_parser_header_CSeq.rl index a9bfc566..4ded31e2 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_CSeq.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_CSeq.rl @@ -114,8 +114,6 @@ tsip_header_CSeq_t *tsip_header_CSeq_parse(const char *data, size_t size) // CSeq header object definition // -/**@ingroup tsip_header_CSeq_group -*/ static void* tsip_header_CSeq_create(void *self, va_list * app) { tsip_header_CSeq_t *CSeq = self; @@ -133,8 +131,6 @@ static void* tsip_header_CSeq_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_CSeq_group -*/ static void* tsip_header_CSeq_destroy(void *self) { tsip_header_CSeq_t *CSeq = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Call_ID.rl b/trunk/tinySIP/ragel/tsip_parser_header_Call_ID.rl index 1d2531ca..0634e1d2 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Call_ID.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Call_ID.rl @@ -121,8 +121,6 @@ tsip_header_Call_ID_t *tsip_header_Call_ID_parse(const char *data, size_t size) // Call_ID header object definition // -/**@ingroup tsip_header_Call_ID_group -*/ static void* tsip_header_Call_ID_create(void *self, va_list * app) { tsip_header_Call_ID_t *Call_ID = self; @@ -139,8 +137,6 @@ static void* tsip_header_Call_ID_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Call_ID_group -*/ static void* tsip_header_Call_ID_destroy(void *self) { tsip_header_Call_ID_t *Call_ID = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Contact.rl b/trunk/tinySIP/ragel/tsip_parser_header_Contact.rl index 2f380cc7..21c998c1 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Contact.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Contact.rl @@ -185,8 +185,6 @@ tsip_header_Contacts_L_t *tsip_header_Contact_parse(const char *data, size_t siz // Contact header object definition // -/**@ingroup tsip_header_Contact_group -*/ static void* tsip_header_Contact_create(void *self, va_list * app) { tsip_header_Contact_t *Contact = self; @@ -203,8 +201,6 @@ static void* tsip_header_Contact_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Contact_group -*/ static void* tsip_header_Contact_destroy(void *self) { tsip_header_Contact_t *Contact = self; @@ -250,8 +246,6 @@ const void *tsip_header_Contact_def_t = &tsip_header_Contact_def_s; // return self; //} // -///**@ingroup tsip_header_Contact_group -//*/ //static void* tsip_contact_destroy(void *self) //{ // tsip_contact_t *contact = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Content_Length.rl b/trunk/tinySIP/ragel/tsip_parser_header_Content_Length.rl index 559e1ebc..7edf522f 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Content_Length.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Content_Length.rl @@ -108,8 +108,6 @@ tsip_header_Content_Length_t *tsip_header_Content_Length_parse(const char *data, // Content_Length header object definition // -/**@ingroup tsip_header_Content_Length_group -*/ static void* tsip_header_Content_Length_create(void *self, va_list * app) { tsip_header_Content_Length_t *Content_Length = self; @@ -127,8 +125,6 @@ static void* tsip_header_Content_Length_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Content_Length_group -*/ static void* tsip_header_Content_Length_destroy(void *self) { tsip_header_Content_Length_t *Content_Length = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Content_Type.rl b/trunk/tinySIP/ragel/tsip_parser_header_Content_Type.rl index da61a07f..7f6ef1fe 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Content_Type.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Content_Type.rl @@ -133,8 +133,6 @@ tsip_header_Content_Type_t *tsip_header_Content_Type_parse(const char *data, siz // Content_Type header object definition // -/**@ingroup tsip_header_Content_Type_group -*/ static void* tsip_header_Content_Type_create(void *self, va_list * app) { tsip_header_Content_Type_t *Content_Type = self; @@ -152,8 +150,6 @@ static void* tsip_header_Content_Type_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Content_Type_group -*/ static void* tsip_header_Content_Type_destroy(void *self) { tsip_header_Content_Type_t *Content_Type = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Dummy.rl b/trunk/tinySIP/ragel/tsip_parser_header_Dummy.rl index 1e617f33..f460e910 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Dummy.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Dummy.rl @@ -121,8 +121,6 @@ tsip_header_Dummy_t *tsip_header_Dummy_parse(const char *data, size_t size) // Dummy header object definition // -/**@ingroup tsip_header_Dummy_group -*/ static void* tsip_header_Dummy_create(void *self, va_list * app) { tsip_header_Dummy_t *Dummy = self; @@ -141,8 +139,6 @@ static void* tsip_header_Dummy_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Dummy_group -*/ static void* tsip_header_Dummy_destroy(void *self) { tsip_header_Dummy_t *Dummy = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Event.rl b/trunk/tinySIP/ragel/tsip_parser_header_Event.rl index ef21b7fd..e7d68140 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Event.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Event.rl @@ -126,8 +126,6 @@ tsip_header_Event_t *tsip_header_Event_parse(const char *data, size_t size) // Event header object definition // -/**@ingroup tsip_header_Event_group -*/ static void* tsip_header_Event_create(void *self, va_list * app) { tsip_header_Event_t *Event = self; @@ -144,8 +142,6 @@ static void* tsip_header_Event_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Event_group -*/ static void* tsip_header_Event_destroy(void *self) { tsip_header_Event_t *Event = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Expires.rl b/trunk/tinySIP/ragel/tsip_parser_header_Expires.rl index b791bc26..2228099d 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Expires.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Expires.rl @@ -113,8 +113,6 @@ tsip_header_Expires_t *tsip_header_Expires_parse(const char *data, size_t size) // Expires header object definition // -/**@ingroup tsip_header_Expires_group -*/ static void* tsip_header_Expires_create(void *self, va_list * app) { tsip_header_Expires_t *Expires = self; @@ -131,8 +129,6 @@ static void* tsip_header_Expires_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Expires_group -*/ static void* tsip_header_Expires_destroy(void *self) { tsip_header_Expires_t *Expires = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_From.rl b/trunk/tinySIP/ragel/tsip_parser_header_From.rl index 6dcd6237..64a1d696 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_From.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_From.rl @@ -140,8 +140,6 @@ tsip_header_From_t *tsip_header_From_parse(const char *data, size_t size) // From header object definition // -/**@ingroup tsip_header_From_group -*/ static void* tsip_header_From_create(void *self, va_list * app) { tsip_header_From_t *From = self; @@ -165,8 +163,6 @@ static void* tsip_header_From_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_From_group -*/ static void* tsip_header_From_destroy(void *self) { tsip_header_From_t *From = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Max_Forwards.rl b/trunk/tinySIP/ragel/tsip_parser_header_Max_Forwards.rl index 16720736..4422f120 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Max_Forwards.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Max_Forwards.rl @@ -113,8 +113,6 @@ tsip_header_Max_Forwards_t *tsip_header_Max_Forwards_parse(const char *data, siz // Max_Forwards header object definition // -/**@ingroup tsip_header_Max_Forwards_group -*/ static void* tsip_header_Max_Forwards_create(void *self, va_list * app) { tsip_header_Max_Forwards_t *Max_Forwards = self; @@ -131,8 +129,6 @@ static void* tsip_header_Max_Forwards_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Max_Forwards_group -*/ static void* tsip_header_Max_Forwards_destroy(void *self) { tsip_header_Max_Forwards_t *Max_Forwards = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Min_Expires.rl b/trunk/tinySIP/ragel/tsip_parser_header_Min_Expires.rl index 2b126574..21d13860 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Min_Expires.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Min_Expires.rl @@ -113,8 +113,6 @@ tsip_header_Min_Expires_t *tsip_header_Min_Expires_parse(const char *data, size_ // Min-Expires header object definition // -/**@ingroup tsip_header_Min_Expires_group -*/ static void* tsip_header_Min_Expires_create(void *self, va_list * app) { tsip_header_Min_Expires_t *Min_Expires = self; @@ -131,8 +129,6 @@ static void* tsip_header_Min_Expires_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Min_Expires_group -*/ static void* tsip_header_Min_Expires_destroy(void *self) { tsip_header_Min_Expires_t *Min_Expires = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Access_Network_Info.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Access_Network_Info.rl index 9acf8bf2..79f5d3bb 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_P_Access_Network_Info.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Access_Network_Info.rl @@ -124,8 +124,6 @@ tsip_header_P_Access_Network_Info_t *tsip_header_P_Access_Network_Info_parse(con // P_Access_Network_Info header object definition // -/**@ingroup tsip_header_P_Access_Network_Info_group -*/ static void* tsip_header_P_Access_Network_Info_create(void *self, va_list * app) { tsip_header_P_Access_Network_Info_t *P_Access_Network_Info = self; @@ -142,8 +140,6 @@ static void* tsip_header_P_Access_Network_Info_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_P_Access_Network_Info_group -*/ static void* tsip_header_P_Access_Network_Info_destroy(void *self) { tsip_header_P_Access_Network_Info_t *P_Access_Network_Info = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Associated_URI.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Associated_URI.rl index cc914dfd..e902192b 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_P_Associated_URI.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Associated_URI.rl @@ -166,8 +166,6 @@ tsip_header_P_Associated_URIs_L_t *tsip_header_P_Associated_URI_parse(const char // P_Associated_URI header object definition // -/**@ingroup tsip_header_P_Associated_URI_group -*/ static void* tsip_header_P_Associated_URI_create(void *self, va_list * app) { tsip_header_P_Associated_URI_t *P_Associated_URI = self; @@ -188,8 +186,6 @@ static void* tsip_header_P_Associated_URI_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_P_Associated_URI_group -*/ static void* tsip_header_P_Associated_URI_destroy(void *self) { tsip_header_P_Associated_URI_t *P_Associated_URI = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Charging_Function_Addresses.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Charging_Function_Addresses.rl index 36d91377..6f0bdcac 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_P_Charging_Function_Addresses.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Charging_Function_Addresses.rl @@ -160,8 +160,6 @@ tsip_header_P_Charging_Function_Addressess_L_t *tsip_header_P_Charging_Function_ // P_Charging_Function_Addresses header object definition // -/**@ingroup tsip_header_P_Charging_Function_Addresses_group -*/ static void* tsip_header_P_Charging_Function_Addresses_create(void *self, va_list * app) { tsip_header_P_Charging_Function_Addresses_t *P_Charging_Function_Addresses = self; @@ -177,8 +175,6 @@ static void* tsip_header_P_Charging_Function_Addresses_create(void *self, va_lis return self; } -/**@ingroup tsip_header_P_Charging_Function_Addresses_group -*/ static void* tsip_header_P_Charging_Function_Addresses_destroy(void *self) { tsip_header_P_Charging_Function_Addresses_t *P_Charging_Function_Addresses = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Preferred_Identity.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Preferred_Identity.rl index 1c6275de..e1600768 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_P_Preferred_Identity.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Preferred_Identity.rl @@ -142,8 +142,6 @@ tsip_header_P_Preferred_Identity_t *tsip_header_P_Preferred_Identity_parse(const // P_Preferred_Identity header object definition // -/**@ingroup tsip_header_P_Preferred_Identity_group -*/ static void* tsip_header_P_Preferred_Identity_create(void *self, va_list * app) { tsip_header_P_Preferred_Identity_t *P_Preferred_Identity = self; @@ -165,8 +163,6 @@ static void* tsip_header_P_Preferred_Identity_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_P_Preferred_Identity_group -*/ static void* tsip_header_P_Preferred_Identity_destroy(void *self) { tsip_header_P_Preferred_Identity_t *P_Preferred_Identity = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Path.rl b/trunk/tinySIP/ragel/tsip_parser_header_Path.rl index e25689ff..733bcc7e 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Path.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Path.rl @@ -167,8 +167,6 @@ tsip_header_Paths_L_t *tsip_header_Path_parse(const char *data, size_t size) // Path header object definition // -/**@ingroup tsip_header_Path_group -*/ static void* tsip_header_Path_create(void *self, va_list * app) { tsip_header_Path_t *Path = self; @@ -189,8 +187,6 @@ static void* tsip_header_Path_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Path_group -*/ static void* tsip_header_Path_destroy(void *self) { tsip_header_Path_t *Path = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Privacy.rl b/trunk/tinySIP/ragel/tsip_parser_header_Privacy.rl index 95a22467..e81d3898 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Privacy.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Privacy.rl @@ -140,8 +140,6 @@ tsip_header_Privacy_t *tsip_header_Privacy_parse(const char *data, size_t size) // Privacy header object definition // -/**@ingroup tsip_header_Privacy_group -*/ static void* tsip_header_Privacy_create(void *self, va_list * app) { tsip_header_Privacy_t *Privacy = self; @@ -157,8 +155,6 @@ static void* tsip_header_Privacy_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Privacy_group -*/ static void* tsip_header_Privacy_destroy(void *self) { tsip_header_Privacy_t *Privacy = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authenticate.rl b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authenticate.rl index cadd26a1..8fe6f2c0 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authenticate.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authenticate.rl @@ -201,8 +201,6 @@ //// Proxy_Authenticate header object definition //// // -///**@ingroup tsip_header_Proxy_Authenticate_group -//*/ //static void* tsip_header_Proxy_Authenticate_create(void *self, va_list * app) //{ // tsip_header_Proxy_Authenticate_t *Proxy_Authenticate = self; @@ -218,8 +216,6 @@ // return self; //} // -///**@ingroup tsip_header_Proxy_Authenticate_group -//*/ //static void* tsip_header_Proxy_Authenticate_destroy(void *self) //{ // tsip_header_Proxy_Authenticate_t *Proxy_Authenticate = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authorization.rl b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authorization.rl index e5321c90..9dafaeb9 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authorization.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authorization.rl @@ -238,8 +238,6 @@ //// Proxy_Authorization header object definition //// // -///**@ingroup tsip_header_Proxy_Authorization_group -//*/ //static void* tsip_header_Proxy_Authorization_create(void *self, va_list * app) //{ // tsip_header_Proxy_Authorization_t *Proxy_Authorization = self; @@ -255,8 +253,6 @@ // return self; //} // -///**@ingroup tsip_header_Proxy_Authorization_group -//*/ //static void* tsip_header_Proxy_Authorization_destroy(void *self) //{ // tsip_header_Proxy_Authorization_t *Proxy_Authorization = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Require.rl b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Require.rl index c609829c..bdcf9700 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Require.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Require.rl @@ -130,8 +130,6 @@ tsip_header_Proxy_Require_t *tsip_header_Proxy_Require_parse(const char *data, s // Proxy_Require header object definition // -/**@ingroup tsip_header_Proxy_Require_group -*/ static void* tsip_header_Proxy_Require_create(void *self, va_list * app) { tsip_header_Proxy_Require_t *Proxy_Require = self; @@ -156,8 +154,6 @@ static void* tsip_header_Proxy_Require_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Proxy_Require_group -*/ static void* tsip_header_Proxy_Require_destroy(void *self) { tsip_header_Proxy_Require_t *Proxy_Require = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Record_Route.rl b/trunk/tinySIP/ragel/tsip_parser_header_Record_Route.rl index c0d643c9..66de5009 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Record_Route.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Record_Route.rl @@ -115,8 +115,6 @@ tsip_header_Record_Route_t *tsip_header_Record_Route_parse(const char *data, siz // Record_Route header object definition // -/**@ingroup tsip_header_Record_Route_group -*/ static void* tsip_header_Record_Route_create(void *self, va_list * app) { tsip_header_Record_Route_t *Record_Route = self; @@ -133,8 +131,6 @@ static void* tsip_header_Record_Route_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Record_Route_group -*/ static void* tsip_header_Record_Route_destroy(void *self) { tsip_header_Record_Route_t *Record_Route = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Require.rl b/trunk/tinySIP/ragel/tsip_parser_header_Require.rl index c948da8b..61943f1f 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Require.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Require.rl @@ -129,8 +129,6 @@ tsip_header_Require_t *tsip_header_Require_parse(const char *data, size_t size) // Require header object definition // -/**@ingroup tsip_header_Require_group -*/ static void* tsip_header_Require_create(void *self, va_list * app) { tsip_header_Require_t *Require = self; @@ -155,8 +153,6 @@ static void* tsip_header_Require_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Require_group -*/ static void* tsip_header_Require_destroy(void *self) { tsip_header_Require_t *Require = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Route.rl b/trunk/tinySIP/ragel/tsip_parser_header_Route.rl index 47debec1..4a9a29b4 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Route.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Route.rl @@ -170,8 +170,6 @@ tsip_header_Routes_L_t *tsip_header_Route_parse(const char *data, size_t size) // Route header object definition // -/**@ingroup tsip_header_Route_group -*/ static void* tsip_header_Route_create(void *self, va_list * app) { tsip_header_Route_t *Route = self; @@ -193,8 +191,6 @@ static void* tsip_header_Route_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Route_group -*/ static void* tsip_header_Route_destroy(void *self) { tsip_header_Route_t *Route = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_SIP_ETag.rl b/trunk/tinySIP/ragel/tsip_parser_header_SIP_ETag.rl index d3f5a12f..de0c41cf 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_SIP_ETag.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_SIP_ETag.rl @@ -1 +1,155 @@ +/* +* Copyright (C) 2009 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ + +/**@file tsip_header_SIP_ETag.c + * @brief SIP SIP-ETag header. + * + * @author Mamadou Diop + * + * @date Created: Sat Nov 8 16:54:58 2009 mdiop + */ +#include "tinysip/headers/tsip_header_SIP_ETag.h" + +#include "tinysip/parsers/tsip_parser_uri.h" + +#include "tsk_debug.h" +#include "tsk_memory.h" + +#include + +/**@defgroup tsip_header_SIP_ETag_group SIP SIP_ETag header. +*/ + +/*********************************** +* Ragel state machine. +*/ +%%{ + machine tsip_machine_parser_header_SIP_ETag; + + # Includes + include tsip_machine_utils "./tsip_machine_utils.rl"; + + action tag + { + tag_start = p; + } + + action parse_etag + { + TSK_PARSER_SET_STRING(hdr_etag->value); + } + + action eob + { + } + + SIP_ETag = "SIP-ETag"i HCOLON token>tag %parse_etag; + + # Entry point + main := SIP_ETag :>CRLF @eob; + +}%% + +int tsip_header_SIP_ETag_tostring(const void* header, tsk_buffer_t* output) +{ + if(header) + { + const tsip_header_SIP_ETag_t *SIP_ETag = header; + if(SIP_ETag->value){ + tsk_buffer_append(output, SIP_ETag->value, strlen(SIP_ETag->value)); + } + return 0; + } + + return -1; +} + +tsip_header_SIP_ETag_t *tsip_header_SIP_ETag_parse(const char *data, size_t size) +{ + int cs = 0; + const char *p = data; + const char *pe = p + size; + const char *eof = pe; + tsip_header_SIP_ETag_t *hdr_etag = TSIP_HEADER_SIP_ETAG_CREATE_NULL(); + + const char *tag_start; + + %%write data; + %%write init; + %%write exec; + + if( cs < %%{ write first_final; }%% ) + { + TSK_OBJECT_SAFE_FREE(hdr_etag); + } + + return hdr_etag; +} + + + + + + + +//======================================================== +// SIP_ETag header object definition +// + +static void* tsip_header_SIP_ETag_create(void *self, va_list * app) +{ + tsip_header_SIP_ETag_t *SIP_ETag = self; + if(SIP_ETag) + { + TSIP_HEADER(SIP_ETag)->type = tsip_htype_SIP_ETag; + TSIP_HEADER(SIP_ETag)->tostring = tsip_header_SIP_ETag_tostring; + SIP_ETag->value = tsk_strdup(va_arg(*app, const char*)); + } + else + { + TSK_DEBUG_ERROR("Failed to create new SIP_ETag header."); + } + return self; +} + +static void* tsip_header_SIP_ETag_destroy(void *self) +{ + tsip_header_SIP_ETag_t *SIP_ETag = self; + if(SIP_ETag) + { + TSK_FREE(SIP_ETag->value); + TSK_OBJECT_SAFE_FREE(TSIP_HEADER_PARAMS(SIP_ETag)); + } + else TSK_DEBUG_ERROR("Null SIP_ETag header."); + + return self; +} + +static const tsk_object_def_t tsip_header_SIP_ETag_def_s = +{ + sizeof(tsip_header_SIP_ETag_t), + tsip_header_SIP_ETag_create, + tsip_header_SIP_ETag_destroy, + 0 +}; +const void *tsip_header_SIP_ETag_def_t = &tsip_header_SIP_ETag_def_s; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_SIP_If_Match.rl b/trunk/tinySIP/ragel/tsip_parser_header_SIP_If_Match.rl index d3f5a12f..cf775fb6 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_SIP_If_Match.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_SIP_If_Match.rl @@ -1 +1,156 @@ +/* +* Copyright (C) 2009 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ + +/**@file tsip_header_SIP_If_Match.c + * @brief SIP SIP-If-Match header. + * + * @author Mamadou Diop + * + * @date Created: Sat Nov 8 16:54:58 2009 mdiop + */ +#include "tinysip/headers/tsip_header_SIP_If_Match.h" + +#include "tinysip/parsers/tsip_parser_uri.h" + +#include "tsk_debug.h" +#include "tsk_memory.h" + +#include + +/**@defgroup tsip_header_SIP_If_Match_group SIP SIP_If_Match header. +*/ + +/*********************************** +* Ragel state machine. +*/ +%%{ + machine tsip_machine_parser_header_SIP_If_Match; + + # Includes + include tsip_machine_utils "./tsip_machine_utils.rl"; + + action tag + { + tag_start = p; + } + + action parse_ifmatch + { + TSK_PARSER_SET_STRING(hdr_ifmatch->value); + } + + action eob + { + } + + SIP_If_Match = "SIP-If-Match"i HCOLON token>tag %parse_ifmatch; + + # Entry point + main := SIP_If_Match :>CRLF @eob; + +}%% + +int tsip_header_SIP_If_Match_tostring(const void* header, tsk_buffer_t* output) +{ + if(header) + { + const tsip_header_SIP_If_Match_t *SIP_If_Match = header; + if(SIP_If_Match->value){ + tsk_buffer_append(output, SIP_If_Match->value, strlen(SIP_If_Match->value)); + } + return 0; + } + + return -1; +} + +tsip_header_SIP_If_Match_t *tsip_header_SIP_If_Match_parse(const char *data, size_t size) +{ + int cs = 0; + const char *p = data; + const char *pe = p + size; + const char *eof = pe; + tsip_header_SIP_If_Match_t *hdr_ifmatch = TSIP_HEADER_SIP_IF_MATCH_CREATE_NULL(); + + const char *tag_start; + + %%write data; + %%write init; + %%write exec; + + if( cs < %%{ write first_final; }%% ) + { + TSK_OBJECT_SAFE_FREE(hdr_ifmatch); + } + + return hdr_ifmatch; +} + + + + + + + +//======================================================== +// SIP_If_Match header object definition +// + +static void* tsip_header_SIP_If_Match_create(void *self, va_list * app) +{ + tsip_header_SIP_If_Match_t *SIP_If_Match = self; + if(SIP_If_Match) + { + TSIP_HEADER(SIP_If_Match)->type = tsip_htype_SIP_If_Match; + TSIP_HEADER(SIP_If_Match)->tostring = tsip_header_SIP_If_Match_tostring; + SIP_If_Match->value = tsk_strdup(va_arg(*app, const char*)); + } + else + { + TSK_DEBUG_ERROR("Failed to create new SIP_If_Match header."); + } + return self; +} + +static void* tsip_header_SIP_If_Match_destroy(void *self) +{ + tsip_header_SIP_If_Match_t *SIP_If_Match = self; + if(SIP_If_Match) + { + TSK_FREE(SIP_If_Match->value); + TSK_OBJECT_SAFE_FREE(TSIP_HEADER_PARAMS(SIP_If_Match)); + } + else TSK_DEBUG_ERROR("Null SIP_If_Match header."); + + return self; +} + +static const tsk_object_def_t tsip_header_SIP_If_Match_def_s = +{ + sizeof(tsip_header_SIP_If_Match_t), + tsip_header_SIP_If_Match_create, + tsip_header_SIP_If_Match_destroy, + 0 +}; +const void *tsip_header_SIP_If_Match_def_t = &tsip_header_SIP_If_Match_def_s; + diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Security_Client.rl b/trunk/tinySIP/ragel/tsip_parser_header_Security_Client.rl index 35e2f4e0..a125fb1a 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Security_Client.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Security_Client.rl @@ -250,8 +250,6 @@ tsip_header_Security_Clients_L_t *tsip_header_Security_Client_parse(const char * // Security_Client header object definition // -/**@ingroup tsip_header_Security_Client_group -*/ static void* tsip_header_Security_Client_create(void *self, va_list * app) { tsip_header_Security_Client_t *Security_Client = self; @@ -288,8 +286,6 @@ static void* tsip_header_Security_Client_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Security_Client_group -*/ static void* tsip_header_Security_Client_destroy(void *self) { tsip_header_Security_Client_t *Security_Client = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Security_Server.rl b/trunk/tinySIP/ragel/tsip_parser_header_Security_Server.rl index 5e7e030b..9c83c430 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Security_Server.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Security_Server.rl @@ -251,8 +251,6 @@ tsip_header_Security_Servers_L_t *tsip_header_Security_Server_parse(const char * // Security_Server header object definition // -/**@ingroup tsip_header_Security_Server_group -*/ static void* tsip_header_Security_Server_create(void *self, va_list * app) { tsip_header_Security_Server_t *Security_Server = self; @@ -271,8 +269,6 @@ static void* tsip_header_Security_Server_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Security_Server_group -*/ static void* tsip_header_Security_Server_destroy(void *self) { tsip_header_Security_Server_t *Security_Server = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Security_Verify.rl b/trunk/tinySIP/ragel/tsip_parser_header_Security_Verify.rl index 1645dc0a..a5848ae6 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Security_Verify.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Security_Verify.rl @@ -250,8 +250,6 @@ tsip_header_Security_Verifies_L_t *tsip_header_Security_Verify_parse(const char // Security_Verify header object definition // -/**@ingroup tsip_header_Security_Verify_group -*/ static void* tsip_header_Security_Verify_create(void *self, va_list * app) { tsip_header_Security_Verify_t *Security_Verify = self; @@ -270,8 +268,6 @@ static void* tsip_header_Security_Verify_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Security_Verify_group -*/ static void* tsip_header_Security_Verify_destroy(void *self) { tsip_header_Security_Verify_t *Security_Verify = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Server.rl b/trunk/tinySIP/ragel/tsip_parser_header_Server.rl index 21489bfa..96b08f0c 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Server.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Server.rl @@ -121,8 +121,6 @@ tsip_header_Server_t *tsip_header_Server_parse(const char *data, size_t size) // Server header object definition // -/**@ingroup tsip_header_Server_group -*/ static void* tsip_header_Server_create(void *self, va_list * app) { tsip_header_Server_t *Server = self; @@ -139,8 +137,6 @@ static void* tsip_header_Server_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Server_group -*/ static void* tsip_header_Server_destroy(void *self) { tsip_header_Server_t *Server = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Service_Route.rl b/trunk/tinySIP/ragel/tsip_parser_header_Service_Route.rl index 4722ced8..5a1d00fd 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Service_Route.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Service_Route.rl @@ -167,8 +167,6 @@ tsip_header_Service_Routes_L_t *tsip_header_Service_Route_parse(const char *data // Service_Route header object definition // -/**@ingroup tsip_header_Service_Route_group -*/ static void* tsip_header_Service_Route_create(void *self, va_list * app) { tsip_header_Service_Route_t *Service_Route = self; @@ -189,8 +187,6 @@ static void* tsip_header_Service_Route_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Service_Route_group -*/ static void* tsip_header_Service_Route_destroy(void *self) { tsip_header_Service_Route_t *Service_Route = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Subscription_State.rl b/trunk/tinySIP/ragel/tsip_parser_header_Subscription_State.rl index 71ef7fce..03623cb9 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Subscription_State.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Subscription_State.rl @@ -146,8 +146,6 @@ tsip_header_Subscription_State_t *tsip_header_Subscription_State_parse(const cha // Subscription_State header object definition // -/**@ingroup tsip_header_Subscription_State_group -*/ static void* tsip_header_Subscription_State_create(void *self, va_list * app) { tsip_header_Subscription_State_t *Subscription_State = self; @@ -166,8 +164,6 @@ static void* tsip_header_Subscription_State_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Subscription_State_group -*/ static void* tsip_header_Subscription_State_destroy(void *self) { tsip_header_Subscription_State_t *Subscription_State = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Supported.rl b/trunk/tinySIP/ragel/tsip_parser_header_Supported.rl index 7ac3984a..7def960a 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Supported.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Supported.rl @@ -129,8 +129,6 @@ tsip_header_Supported_t *tsip_header_Supported_parse(const char *data, size_t si // Supported header object definition // -/**@ingroup tsip_header_Supported_group -*/ static void* tsip_header_Supported_create(void *self, va_list * app) { tsip_header_Supported_t *Supported = self; @@ -155,8 +153,6 @@ static void* tsip_header_Supported_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Supported_group -*/ static void* tsip_header_Supported_destroy(void *self) { tsip_header_Supported_t *Supported = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_To.rl b/trunk/tinySIP/ragel/tsip_parser_header_To.rl index 3c29ef95..4d84e07f 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_To.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_To.rl @@ -140,8 +140,6 @@ tsip_header_To_t *tsip_header_To_parse(const char *data, size_t size) // To header object definition // -/**@ingroup tsip_header_To_group -*/ static void* tsip_header_To_create(void *self, va_list * app) { tsip_header_To_t *To = self; @@ -165,8 +163,6 @@ static void* tsip_header_To_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_To_group -*/ static void* tsip_header_To_destroy(void *self) { tsip_header_To_t *To = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_User_Agent.rl b/trunk/tinySIP/ragel/tsip_parser_header_User_Agent.rl index b5e621c1..dc29c8ad 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_User_Agent.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_User_Agent.rl @@ -116,8 +116,6 @@ tsip_header_User_Agent_t *tsip_header_User_Agent_parse(const char *data, size_t // User_Agent header object definition // -/**@ingroup tsip_header_User_Agent_group -*/ static void* tsip_header_User_Agent_create(void *self, va_list * app) { tsip_header_User_Agent_t *User_Agent = self; @@ -134,8 +132,6 @@ static void* tsip_header_User_Agent_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_User_Agent_group -*/ static void* tsip_header_User_Agent_destroy(void *self) { tsip_header_User_Agent_t *User_Agent = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Via.rl b/trunk/tinySIP/ragel/tsip_parser_header_Via.rl index 8854189b..ffb4536e 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Via.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Via.rl @@ -235,8 +235,6 @@ tsip_header_Via_t *tsip_header_Via_parse(const char *data, size_t size) // Via header object definition // -/**@ingroup tsip_header_Via_group -*/ static void* tsip_header_Via_create(void *self, va_list * app) { tsip_header_Via_t *via = self; @@ -271,8 +269,6 @@ static void* tsip_header_Via_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Via_group -*/ static void* tsip_header_Via_destroy(void *self) { tsip_header_Via_t *via = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_WWW_Authenticate.rl b/trunk/tinySIP/ragel/tsip_parser_header_WWW_Authenticate.rl index 89ef0c65..dbd80f4f 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_WWW_Authenticate.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_WWW_Authenticate.rl @@ -37,8 +37,6 @@ // //#include // -///**@defgroup tsip_header_WWW_Authenticate_group SIP WWW-Authenticate header. -//*/ // ///*********************************** //* Ragel state machine. @@ -201,8 +199,6 @@ //// WWW_Authenticate header object definition //// // -///**@ingroup tsip_header_WWW_Authenticate_group -//*/ //static void* tsip_header_WWW_Authenticate_create(void *self, va_list * app) //{ // tsip_header_WWW_Authenticate_t *WWW_Authenticate = self; @@ -218,8 +214,6 @@ // return self; //} // -///**@ingroup tsip_header_WWW_Authenticate_group -//*/ //static void* tsip_header_WWW_Authenticate_destroy(void *self) //{ // tsip_header_WWW_Authenticate_t *WWW_Authenticate = self; diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Warning.rl b/trunk/tinySIP/ragel/tsip_parser_header_Warning.rl index 9875a72b..c95a9003 100644 --- a/trunk/tinySIP/ragel/tsip_parser_header_Warning.rl +++ b/trunk/tinySIP/ragel/tsip_parser_header_Warning.rl @@ -154,8 +154,6 @@ tsip_header_Warnings_L_t *tsip_header_Warning_parse(const char *data, size_t siz // Warning header object definition // -/**@ingroup tsip_header_Warning_group -*/ static void* tsip_header_Warning_create(void *self, va_list * app) { tsip_header_Warning_t *Warning = self; @@ -173,8 +171,6 @@ static void* tsip_header_Warning_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Warning_group -*/ static void* tsip_header_Warning_destroy(void *self) { tsip_header_Warning_t *Warning = self; diff --git a/trunk/tinySIP/src/api/tsip_api_publish.c b/trunk/tinySIP/src/api/tsip_api_publish.c index e69de29b..f48c5f6c 100644 --- a/trunk/tinySIP/src/api/tsip_api_publish.c +++ b/trunk/tinySIP/src/api/tsip_api_publish.c @@ -0,0 +1,174 @@ +/* +* Copyright (C) 2009 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ + +/**@file tsip_api_publish.c + * @brief Public subscription (PUBLISH) functions. + * + * @author Mamadou Diop + * + * @date Created: Sat Nov 8 16:54:58 2009 mdiop + */ +#include "tinysip/api/tsip_api_publish.h" + +#include "tinysip/dialogs/tsip_dialog_layer.h" +#include "tinysip/dialogs/tsip_dialog_publish.h" + +#include "tsip.h" + +#include "tsk_runnable.h" +#include "tsk_debug.h" + +#define TSIP_PUBLISH_EVENT_CREATE( type) tsk_object_new(tsip_publish_event_def_t, type) + +int tsip_publish_event_signal(tsip_publish_event_type_t type, struct tsip_stack_s *stack, tsip_operation_id_t opid, short status_code, const char *phrase, const tsip_message_t* sipmessage) +{ + tsip_publish_event_t* sipevent = TSIP_PUBLISH_EVENT_CREATE(type); + tsip_event_init(TSIP_EVENT(sipevent), stack, opid, status_code, phrase, sipmessage, tsip_event_publish); + + TSK_RUNNABLE_ENQUEUE_OBJECT(TSK_RUNNABLE(stack), sipevent); + + return 0; +} + +int tsip_publish(tsip_stack_handle_t *_stack, const tsip_operation_handle_t *operation) +{ + int ret = -1; + + if(_stack && operation) + { + tsip_stack_t *stack = _stack; + tsip_dialog_publish_t *dialog; + + if((dialog = (tsip_dialog_publish_t*)tsip_dialog_layer_find_by_op(stack->layer_dialog, tsip_dialog_publish, operation))){ + TSK_DEBUG_WARN("Already published.");// FIXME: update + ret = -2; + goto bail; + } + else{ + dialog = TSIP_DIALOG_PUBLISH_CREATE(stack, operation); + ret = tsip_dialog_publish_start(dialog); + tsk_list_push_back_data(stack->layer_dialog->dialogs, (void**)&dialog); + } + } + +bail: + return ret; +} + +int tsip_publish_modify(tsip_stack_handle_t *_stack, const tsip_operation_handle_t *operation) +{ + int ret = -1; + + if(_stack && operation) + { + tsip_stack_t *stack = _stack; + tsip_dialog_publish_t *dialog; + + if((dialog = (tsip_dialog_publish_t*)tsip_dialog_layer_find_by_op(stack->layer_dialog, tsip_dialog_publish, operation))){ + ret = tsip_dialog_publish_modify(dialog); + } + else{ + TSK_DEBUG_ERROR("Failed to find PUBLISH dialog with this opid [%lld]", tsip_operation_get_id(operation)); + } + } + + return ret; +} + +int tsip_publish_remove(tsip_stack_handle_t *_stack, const tsip_operation_handle_t *operation) +{ + int ret = -1; + + if(_stack && operation) + { + tsip_stack_t *stack = _stack; + tsip_dialog_publish_t *dialog; + + if((dialog = (tsip_dialog_publish_t*)tsip_dialog_layer_find_by_op(stack->layer_dialog, tsip_dialog_publish, operation))){ + ret = tsip_dialog_publish_remove(dialog); + } + else{ + TSK_DEBUG_ERROR("Failed to find PUBLISH dialog with this opid [%lld]", tsip_operation_get_id(operation)); + } + } + + return ret; +} + +int tsip_unpublish(tsip_stack_handle_t *_stack, const tsip_operation_handle_t *operation) +{ + if(_stack && operation) + { + //const tsip_stack_t *stack = self; + //tsip_operation_handle_t *op = tsip_operation_clone(operation); + + //tsk_list_push_back_data(stack->operations, (void**)&op); + } + return -1; +} + + + + + + + + + + + + + +//======================================================== +// SIP PUBLISH event object definition +// +static void* tsip_publish_event_create(void * self, va_list * app) +{ + tsip_publish_event_t *sipevent = self; + if(sipevent){ + sipevent->type = va_arg(*app, tsip_publish_event_type_t); + } + return self; +} + +static void* tsip_publish_event_destroy(void * self) +{ + tsip_publish_event_t *sipevent = self; + if(sipevent){ + tsip_event_deinit(TSIP_EVENT(sipevent)); + } + return self; +} + +static int tsip_publish_event_cmp(const void *obj1, const void *obj2) +{ + return -1; +} + +static const tsk_object_def_t tsip_publish_event_def_s = +{ + sizeof(tsip_publish_event_t), + tsip_publish_event_create, + tsip_publish_event_destroy, + tsip_publish_event_cmp, +}; +const void *tsip_publish_event_def_t = &tsip_publish_event_def_s; diff --git a/trunk/tinySIP/src/api/tsip_api_subscribe.c b/trunk/tinySIP/src/api/tsip_api_subscribe.c index 17aba949..28891e4c 100644 --- a/trunk/tinySIP/src/api/tsip_api_subscribe.c +++ b/trunk/tinySIP/src/api/tsip_api_subscribe.c @@ -59,14 +59,12 @@ int tsip_subscribe(tsip_stack_handle_t *_stack, const tsip_operation_handle_t *o tsip_dialog_subscribe_t *dialog; dialog = (tsip_dialog_subscribe_t*)tsip_dialog_layer_find_by_op(stack->layer_dialog, tsip_dialog_subscribe, operation); - if(dialog) - { + if(dialog){ TSK_DEBUG_WARN("Already subscribeed."); ret = -2; goto bail; } - else - { + else{ dialog = TSIP_DIALOG_SUBSCRIBE_CREATE(stack, operation); ret = tsip_dialog_subscribe_start(dialog); tsk_list_push_back_data(stack->layer_dialog->dialogs, (void**)&dialog); @@ -107,8 +105,7 @@ int tsip_unsubscribe(tsip_stack_handle_t *_stack, const tsip_operation_handle_t static void* tsip_subscribe_event_create(void * self, va_list * app) { tsip_subscribe_event_t *sipevent = self; - if(sipevent) - { + if(sipevent){ sipevent->type = va_arg(*app, tsip_subscribe_event_type_t); } return self; @@ -117,8 +114,7 @@ static void* tsip_subscribe_event_create(void * self, va_list * app) static void* tsip_subscribe_event_destroy(void * self) { tsip_subscribe_event_t *sipevent = self; - if(sipevent) - { + if(sipevent){ tsip_event_deinit(TSIP_EVENT(sipevent)); } return self; diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_message.c b/trunk/tinySIP/src/dialogs/tsip_dialog_message.c index a986cd38..e2a49628 100644 --- a/trunk/tinySIP/src/dialogs/tsip_dialog_message.c +++ b/trunk/tinySIP/src/dialogs/tsip_dialog_message.c @@ -122,8 +122,8 @@ int tsip_dialog_message_event_callback(const tsip_dialog_message_t *self, tsip_d TSK_DEBUG_WARN("Not supported status code: %d", status_code); } } - else // REQUEST ==> Incoming MESSAGE - { + else{ + // REQUEST ==> Incoming MESSAGE ret = tsk_fsm_act(self->fsm, _fsm_action_receiveMESSAGE, self, msg, self, msg); } } @@ -230,10 +230,9 @@ int tsip_dialog_message_start(tsip_dialog_message_t *self) size_t content_length = 0; tsip_request_t* request; - if((request = tsip_dialog_request_new(TSIP_DIALOG(self), "MESSAGE"))){ /* content-length */ - if((param = tsip_operation_get_param(TSIP_DIALOG(self)->operation, "content-length"))){ + if((param = tsip_operation_get_header(TSIP_DIALOG(self)->operation, "Content-Length"))){ content_length = atoi(param->value); } /* content */ diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_publish.client.c b/trunk/tinySIP/src/dialogs/tsip_dialog_publish.client.c index e69de29b..47f3779c 100644 --- a/trunk/tinySIP/src/dialogs/tsip_dialog_publish.client.c +++ b/trunk/tinySIP/src/dialogs/tsip_dialog_publish.client.c @@ -0,0 +1,670 @@ +/* +* Copyright (C) 2009 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as publishd by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ + +/**@file tsip_dialog_publish.c + * @brief SIP dialog PUBLISH as per RFC 3903. + * + * @author Mamadou Diop + * + * @date Created: Sat Nov 8 16:54:58 2009 mdiop + */ +#include "tinysip/dialogs/tsip_dialog_publish.h" + +#include "tinysip/headers/tsip_header_Min_Expires.h" +#include "tinysip/headers/tsip_header_SIP_ETag.h" +#include "tinysip/headers/tsip_header_SIP_If_Match.h" + +#include "tinysip/tsip_message.h" + +#include "tinysip/api/tsip_api_publish.h" + +#include "tsk_debug.h" +#include "tsk_time.h" + +/**@defgroup tsip_dialog_publish_group SIP dialog PUBLISH (Client side) as per RFC 3265. +*/ + +#define DEBUG_STATE_MACHINE 1 +#define TSIP_DIALOG_PUBLISH_TIMER_SCHEDULE(TX) TSIP_DIALOG_TIMER_SCHEDULE(publish, TX) +#define TSIP_DIALOG_PUBLISH_SIGNAL(self, type, code, phrase, message) \ + tsip_publish_event_signal(type, TSIP_DIALOG_GET_STACK(self), tsip_operation_get_id(TSIP_DIALOG(self)->operation), code, phrase, message) + +/* ======================== internal functions ======================== */ +int send_publish(tsip_dialog_publish_t *self, refresh_type_t rtype); +int tsip_dialog_publish_OnTerminated(tsip_dialog_publish_t *self); + +/* ======================== transitions ======================== */ +int tsip_dialog_publish_Started_2_Trying_X_send(va_list *app); +int tsip_dialog_publish_Trying_2_Trying_X_1xx(va_list *app); +int tsip_dialog_publish_Trying_2_Terminated_X_2xx(va_list *app); +int tsip_dialog_publish_Trying_2_Connected_X_2xx(va_list *app); +int tsip_dialog_publish_Trying_2_Trying_X_401_407_421_494(va_list *app); +int tsip_dialog_publish_Trying_2_Trying_X_423(va_list *app); +int tsip_dialog_publish_Trying_2_Terminated_X_300_to_699(va_list *app); +int tsip_dialog_publish_Trying_2_Terminated_X_cancel(va_list *app); +int tsip_dialog_publish_Connected_2_Trying_X_unpublish(va_list *app); +int tsip_dialog_publish_Connected_2_Trying_X_refresh(va_list *app); +int tsip_dialog_publish_Any_2_Trying_X_hangup(va_list *app); +int tsip_dialog_publish_Any_2_Terminated_X_transportError(va_list *app); +int tsip_dialog_publish_Any_2_Terminated_X_Error(va_list *app); + +/* ======================== conds ======================== */ +int _fsm_cond_unpublishing(tsip_dialog_publish_t* dialog, tsip_message_t* message) +{ + return dialog->unpublishing ? 1 : 0; +} +int _fsm_cond_publishing(tsip_dialog_publish_t* dialog, tsip_message_t* message) +{ + return !_fsm_cond_unpublishing(dialog, message); +} + + +/* ======================== actions ======================== */ +typedef enum _fsm_action_e +{ + _fsm_action_send, + _fsm_action_1xx, + _fsm_action_2xx, + _fsm_action_401_407_421_494, + _fsm_action_423, + _fsm_action_300_to_699, + _fsm_action_cancel, + _fsm_action_unpublish, + _fsm_action_refresh, + _fsm_action_hangup, + _fsm_action_transporterror, + _fsm_action_error, +} +_fsm_action_t; + +/* ======================== states ======================== */ +typedef enum _fsm_state_e +{ + _fsm_state_Started, + _fsm_state_Trying, + _fsm_state_Connected, + _fsm_state_Terminated +} +_fsm_state_t; + + +/** + * Callback function called to alert the dialog for new events from the transaction/transport layers. + * + * @param [in,out] self A reference to the dialog. + * @param type The event type. + * @param [in,out] msg The incoming SIP/IMS message. + * + * @return Zero if succeed and non-zero error code otherwise. +**/ +int tsip_dialog_publish_event_callback(const tsip_dialog_publish_t *self, tsip_dialog_event_type_t type, const tsip_message_t *msg) +{ + int ret = -1; + + switch(type) + { + case tsip_dialog_i_msg: + { + if(msg && TSIP_MESSAGE_IS_RESPONSE(msg)) + { + // + // RESPONSE + // + if(TSIP_RESPONSE_IS_1XX(msg)){ + ret = tsk_fsm_act(self->fsm, _fsm_action_1xx, self, msg, self, msg); + } + else if(TSIP_RESPONSE_IS_2XX(msg)){ + ret = tsk_fsm_act(self->fsm, _fsm_action_2xx, self, msg, self, msg); + } + else if(TSIP_RESPONSE_IS(msg,401) || TSIP_RESPONSE_IS(msg,407) || TSIP_RESPONSE_IS(msg,421) || TSIP_RESPONSE_IS(msg,494)){ + ret = tsk_fsm_act(self->fsm, _fsm_action_401_407_421_494, self, msg, self, msg); + } + else if(TSIP_RESPONSE_IS(msg,423)){ + ret = tsk_fsm_act(self->fsm, _fsm_action_423, self, msg, self, msg); + } + else{ + // Alert User + ret = tsk_fsm_act(self->fsm, _fsm_action_error, self, msg, self, msg); + TSK_DEBUG_WARN("Not supported status code: %d", TSIP_RESPONSE_CODE(msg)); + } + } + else + { + // + // REQUEST + // + if(tsk_striequals(TSIP_REQUEST_METHOD(msg), "PUBLISH")){ + // FIXME: send loop detected + } + else{ + // FIXME: Method not suported + } + } + break; + } + + case tsip_dialog_hang_up: + { + ret = tsk_fsm_act(self->fsm, _fsm_action_hangup, self, msg, self, msg); + break; + } + + case tsip_dialog_canceled: + { + ret = tsk_fsm_act(self->fsm, _fsm_action_cancel, self, msg, self, msg); + break; + } + + case tsip_dialog_terminated: + case tsip_dialog_timedout: + case tsip_dialog_error: + case tsip_dialog_transport_error: + { + ret = tsk_fsm_act(self->fsm, _fsm_action_transporterror, self, msg, self, msg); + break; + } + } + + return ret; +} + +/** + * Timer manager callback. + * + * @param [in,out] self The owner of the signaled timer. + * @param timer_id The identifier of the signaled timer. + * + * @return Zero if succeed and non-zero error code otherwise. +**/ +int tsip_dialog_publish_timer_callback(const tsip_dialog_publish_t* self, tsk_timer_id_t timer_id) +{ + int ret = -1; + + if(self) + { + if(timer_id == self->timerrefresh.id){ + tsk_fsm_act(self->fsm, _fsm_action_refresh, self, TSK_NULL, self, TSK_NULL, rt_timedout); + ret = 0; + } + } + return ret; +} + +/** + * Initializes the dialog. + * + * @param [in,out] self The dialog to initialize. +**/ +int tsip_dialog_publish_init(tsip_dialog_publish_t *self) +{ + /* Initialize the State Machine. */ + tsk_fsm_set(self->fsm, + + /*======================= + * === Started === + */ + // Started -> (Send) -> Trying + TSK_FSM_ADD_ALWAYS(_fsm_state_Started, _fsm_action_send, _fsm_state_Trying, tsip_dialog_publish_Started_2_Trying_X_send, "tsip_dialog_publish_Started_2_Trying_X_send"), + // Started -> (Any) -> Started + TSK_FSM_ADD_ALWAYS_NOTHING(_fsm_state_Started, "tsip_dialog_publish_Started_2_Started_X_any"), + + + /*======================= + * === Trying === + */ + // Trying -> (1xx) -> Trying + TSK_FSM_ADD_ALWAYS(_fsm_state_Trying, _fsm_action_1xx, _fsm_state_Trying, tsip_dialog_publish_Trying_2_Trying_X_1xx, "tsip_dialog_publish_Trying_2_Trying_X_1xx"), + // Trying -> (2xx) -> Terminated + TSK_FSM_ADD(_fsm_state_Trying, _fsm_action_2xx, _fsm_cond_unpublishing, _fsm_state_Terminated, tsip_dialog_publish_Trying_2_Terminated_X_2xx, "tsip_dialog_publish_Trying_2_Terminated_X_2xx"), + // Trying -> (2xx) -> Connected + TSK_FSM_ADD(_fsm_state_Trying, _fsm_action_2xx, _fsm_cond_publishing, _fsm_state_Connected, tsip_dialog_publish_Trying_2_Connected_X_2xx, "tsip_dialog_publish_Trying_2_Connected_X_2xx"), + // Trying -> (401/407/421/494) -> Trying + TSK_FSM_ADD_ALWAYS(_fsm_state_Trying, _fsm_action_401_407_421_494, _fsm_state_Trying, tsip_dialog_publish_Trying_2_Trying_X_401_407_421_494, "tsip_dialog_publish_Trying_2_Trying_X_401_407_421_494"), + // Trying -> (423) -> Trying + TSK_FSM_ADD_ALWAYS(_fsm_state_Trying, _fsm_action_423, _fsm_state_Trying, tsip_dialog_publish_Trying_2_Trying_X_423, "tsip_dialog_publish_Trying_2_Trying_X_423"), + // Trying -> (300_to_699) -> Terminated + TSK_FSM_ADD_ALWAYS(_fsm_state_Trying, _fsm_action_300_to_699, _fsm_state_Terminated, tsip_dialog_publish_Trying_2_Terminated_X_300_to_699, "tsip_dialog_publish_Trying_2_Terminated_X_300_to_699"), + // Trying -> (cancel) -> Terminated + TSK_FSM_ADD_ALWAYS(_fsm_state_Trying, _fsm_action_cancel, _fsm_state_Terminated, tsip_dialog_publish_Trying_2_Terminated_X_cancel, "tsip_dialog_publish_Trying_2_Terminated_X_cancel"), + // Trying -> (Any) -> Trying + TSK_FSM_ADD_ALWAYS_NOTHING(_fsm_state_Trying, "tsip_dialog_publish_Trying_2_Trying_X_any"), + + + /*======================= + * === Connected === + */ + // Connected -> (unpublish) -> Trying + TSK_FSM_ADD_ALWAYS(_fsm_state_Connected, _fsm_action_unpublish, _fsm_state_Trying, tsip_dialog_publish_Connected_2_Trying_X_unpublish, "tsip_dialog_publish_Connected_2_Trying_X_unpublish"), + // Connected -> (refresh) -> Trying + TSK_FSM_ADD_ALWAYS(_fsm_state_Connected, _fsm_action_refresh, _fsm_state_Trying, tsip_dialog_publish_Connected_2_Trying_X_refresh, "tsip_dialog_publish_Connected_2_Trying_X_refresh"), + // Connected -> (Any) -> Connected + TSK_FSM_ADD_ALWAYS_NOTHING(_fsm_state_Connected, "tsip_dialog_publish_Connected_2_Connected_X_any"), + + /*======================= + * === Any === + */ + // Any -> (transport error) -> Terminated + TSK_FSM_ADD_ALWAYS(tsk_fsm_state_any, _fsm_action_transporterror, _fsm_state_Terminated, tsip_dialog_publish_Any_2_Terminated_X_transportError, "tsip_dialog_publish_Any_2_Terminated_X_transportError"), + // Any -> (transport error) -> Terminated + TSK_FSM_ADD_ALWAYS(tsk_fsm_state_any, _fsm_action_error, _fsm_state_Terminated, tsip_dialog_publish_Any_2_Terminated_X_Error, "tsip_dialog_publish_Any_2_Terminated_X_Error"), + // Any -> (hangup) -> Trying + TSK_FSM_ADD_ALWAYS(tsk_fsm_state_any, _fsm_action_hangup, _fsm_state_Trying, tsip_dialog_publish_Any_2_Trying_X_hangup, "tsip_dialog_publish_Any_2_Trying_X_hangup"), + + TSK_FSM_ADD_NULL()); + + TSIP_DIALOG(self)->callback = TSIP_DIALOG_EVENT_CALLBACK(tsip_dialog_publish_event_callback); + + self->timerrefresh.id = TSK_INVALID_TIMER_ID; + self->timerrefresh.timeout = TSIP_DIALOG(self)->expires; + self->last_rtype = rt_initial; + + return 0; +} + +int tsip_dialog_publish_start(tsip_dialog_publish_t *self) +{ + int ret = -1; + if(self && !TSIP_DIALOG(self)->running){ + ret = tsk_fsm_act(self->fsm, _fsm_action_send, self, TSK_NULL, self, TSK_NULL); + } + return ret; +} + +int tsip_dialog_publish_modify(tsip_dialog_publish_t *self) +{ + if(self && TSIP_DIALOG(self)->running){ + return tsk_fsm_act(self->fsm, _fsm_action_refresh, self, TSK_NULL, self, TSK_NULL, rt_modify); + } + return -1; +} + +int tsip_dialog_publish_remove(tsip_dialog_publish_t *self) +{ + if(self && TSIP_DIALOG(self)->running){ + return tsk_fsm_act(self->fsm, _fsm_action_refresh, self, TSK_NULL, self, TSK_NULL, rt_remove); + } + return -1; +} + +//-------------------------------------------------------- +// == STATE MACHINE BEGIN == +//-------------------------------------------------------- + + +/* Started -> (send) -> Trying +*/ +int tsip_dialog_publish_Started_2_Trying_X_send(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_response_t *response = va_arg(*app, const tsip_response_t *); + + TSIP_DIALOG(self)->running = 1; + + return send_publish(self, rt_initial); +} + +/* Trying -> (1xx) -> Trying +*/ +int tsip_dialog_publish_Trying_2_Trying_X_1xx(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_response_t *response = va_arg(*app, const tsip_response_t *); + + return 0; +} + +/* Trying -> (2xx) -> Terminated +*/ +int tsip_dialog_publish_Trying_2_Terminated_X_2xx(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_response_t *response = va_arg(*app, const tsip_response_t *); + + /* Alert the user. */ + TSIP_DIALOG_PUBLISH_SIGNAL(self, self->unpublishing ? tsip_ao_unpublish : tsip_ao_publish, + TSIP_RESPONSE_CODE(response), TSIP_RESPONSE_PHRASE(response), response); + + return 0; +} + +/* Trying -> (2xx) -> Connected +*/ +int tsip_dialog_publish_Trying_2_Connected_X_2xx(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_response_t *response = va_arg(*app, const tsip_response_t *); + + /* RFC 3903 - 4.1. Identification of Published Event State + For each successful PUBLISH request, the ESC will generate and assign + an entity-tag and return it in the SIP-ETag header field of the 2xx + response. + */ + const tsip_header_SIP_ETag_t *SIP_ETag; + if((SIP_ETag = (const tsip_header_SIP_ETag_t*)tsip_message_get_header(response, tsip_htype_SIP_ETag))){ + tsk_strupdate(&self->etag, SIP_ETag->value); + } + + /* Alert the user. */ + TSIP_DIALOG_PUBLISH_SIGNAL(self, self->unpublishing ? tsip_ao_unpublish : tsip_ao_publish, + TSIP_RESPONSE_CODE(response), TSIP_RESPONSE_PHRASE(response), response); + + /* Update the dialog state. */ + tsip_dialog_update(TSIP_DIALOG(self), response); + + /* Request timeout for dialog refresh (re-publish). */ + self->timerrefresh.timeout = tsip_dialog_get_newdelay(TSIP_DIALOG(self), response); + TSIP_DIALOG_PUBLISH_TIMER_SCHEDULE(refresh); + + return 0; +} + +/* Trying -> (401/407/421/494) -> Trying +*/ +int tsip_dialog_publish_Trying_2_Trying_X_401_407_421_494(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_response_t *response = va_arg(*app, const tsip_response_t *); + + if(tsip_dialog_update(TSIP_DIALOG(self), response)){ + /* Alert the user. */ + TSIP_DIALOG_PUBLISH_SIGNAL(self, self->unpublishing ? tsip_ao_unpublish : tsip_ao_publish, + TSIP_RESPONSE_CODE(response), TSIP_RESPONSE_PHRASE(response), response); + + return -1; + } + + return send_publish(self, self->last_rtype); +} + +/* Trying -> (423) -> Trying +*/ +int tsip_dialog_publish_Trying_2_Trying_X_423(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_response_t *response = va_arg(*app, const tsip_response_t *); + + tsip_header_Min_Expires_t *hdr; + + /* + RFC 3261 - 10.2.8 Error Responses + + If a UA receives a 423 (Interval Too Brief) response, it MAY retry + the registration after making the expiration interval of all contact + addresses in the PUBLISH request equal to or greater than the + expiration interval within the Min-Expires header field of the 423 + (Interval Too Brief) response. + */ + hdr = (tsip_header_Min_Expires_t*)tsip_message_get_header(response, tsip_htype_Min_Expires); + if(hdr){ + TSIP_DIALOG(self)->expires = hdr->value; + send_publish(self, self->last_rtype); + } + else{ + TSIP_DIALOG_PUBLISH_SIGNAL(self, self->unpublishing ? tsip_ao_unpublish : tsip_ao_publish, + 715, "Invalid SIP response.", response); + + return -1; + } + + return 0; +} + +/* Trying -> (300 to 699) -> Terminated +*/ +int tsip_dialog_publish_Trying_2_Terminated_X_300_to_699(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_response_t *response = va_arg(*app, const tsip_response_t *); + + /* Alert the user. */ + TSIP_DIALOG_PUBLISH_SIGNAL(self, self->unpublishing ? tsip_ao_unpublish : tsip_ao_publish, + TSIP_RESPONSE_CODE(response), TSIP_RESPONSE_PHRASE(response), response); + + return 0; +} + +/* Trying -> (cancel) -> Terminated +*/ +int tsip_dialog_publish_Trying_2_Terminated_X_cancel(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_message_t *message = va_arg(*app, const tsip_message_t *); + + /* Alert the user. */ + TSIP_DIALOG_PUBLISH_SIGNAL(self, self->unpublishing ? tsip_ao_unpublish : tsip_ao_publish, + 701, "Subscription cancelled", TSIP_NULL); + + return 0; +} + +/* Connected -> (unpublish) -> Trying +*/ +int tsip_dialog_publish_Connected_2_Trying_X_unpublish(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_message_t *message = va_arg(*app, const tsip_message_t *); + + return 0; +} + +/* Connected -> (refresh) -> Trying +*/ +int tsip_dialog_publish_Connected_2_Trying_X_refresh(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_message_t *message = va_arg(*app, const tsip_message_t *); + refresh_type_t rtype = va_arg(*app, refresh_type_t); + + return send_publish(self, rtype); +} + +/* Connected -> (hangup) -> Trying +*/ +int tsip_dialog_publish_Any_2_Trying_X_hangup(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_message_t *message = va_arg(*app, const tsip_message_t *); + + return 0; +} + +/* Any -> (transport error) -> Terminated +*/ +int tsip_dialog_publish_Any_2_Terminated_X_transportError(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_message_t *message = va_arg(*app, const tsip_message_t *); + + return 0; +} + +/* Any -> (Error) -> Terminated +*/ +int tsip_dialog_publish_Any_2_Terminated_X_Error(va_list *app) +{ + tsip_dialog_publish_t *self = va_arg(*app, tsip_dialog_publish_t *); + const tsip_message_t *message = va_arg(*app, const tsip_message_t *); + + return 0; +} + + + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// == STATE MACHINE END == +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + +/** + * Sends a PUBLISH request. +**/ +int send_publish(tsip_dialog_publish_t *self, refresh_type_t rtype) +{ + tsip_request_t *request; + int ret = -1; + int addbody; + + /* IMPORTANT: Update last refresh type before trying (because of 423, 401, 407, ...)*/ + + if(self->unpublishing){ + TSIP_DIALOG(self)->expires = 0; + self->last_rtype = rt_remove; /* Who know? */ + } + else{ + self->last_rtype = rtype; + } + + + + /* RFC 3903 - 4.1. Identification of Published Event State + The presence of a body and the SIP-If-Match header field determine + the specific operation that the request is performing, as described in Table 1. + +-----------+-------+---------------+---------------+ + | Operation | Body? | SIP-If-Match? | Expires Value | + +-----------+-------+---------------+---------------+ + | Initial | yes | no | > 0 | + | Refresh | no | yes | > 0 | + | Modify | yes | yes | > 0 | + | Remove | no | yes | 0 | + +-----------+-------+---------------+---------------+ + Table 1: Publication Operations + */ + addbody = (TSIP_DIALOG(self)->expires > 0 && rtype == rt_initial) /* Initial */ + || (TSIP_DIALOG(self)->expires > 0 && rtype == rt_modify); /* Modify */ + + if((request = tsip_dialog_request_new(TSIP_DIALOG(self), "PUBLISH"))){ + /*Etag. If initial then etag is null. */ + if(self->etag){ + TSIP_MESSAGE_ADD_HEADER(request, TSIP_HEADER_SIP_IF_MATCH_VA_ARGS(self->etag)); + } + /*Body*/ + if(addbody){ + const tsk_param_t* param; + const void* content = TSIP_NULL; + size_t content_length = 0; + + /* content-length */ + if((param = tsip_operation_get_header(TSIP_DIALOG(self)->operation, "Content-Length"))){ + content_length = atoi(param->value); + } + /* content */ + if((param = tsip_operation_get_param(TSIP_DIALOG(self)->operation, "content"))){ + content = param->value; + if(!content_length && content){ + content_length = strlen(content); + } + if(content){ + tsip_message_add_content(request, TSIP_NULL, content, content_length); + } + } + } + + ret = tsip_dialog_request_send(TSIP_DIALOG(self), request); + TSK_OBJECT_SAFE_FREE(request); + } + + return ret; +} + +/** + * Callback function called by the state machine manager to signal that the final state has been reached. + * + * @param [in,out] self The state machine owner. +**/ +int tsip_dialog_publish_OnTerminated(tsip_dialog_publish_t *self) +{ + TSK_DEBUG_INFO("=== PUBLISH Dialog terminated ==="); + + /* Cancel all timers */ + DIALOG_TIMER_CANCEL(refresh); + + /* Remove from the dialog layer. */ + return tsip_dialog_remove(TSIP_DIALOG(self)); +} + + + + + + + + + + + + + +//======================================================== +// SIP dialog PUBLISH object definition +// +static void* tsip_dialog_publish_create(void * self, va_list * app) +{ + tsip_dialog_publish_t *dialog = self; + if(dialog) + { + tsip_stack_handle_t *stack = va_arg(*app, tsip_stack_handle_t *); + tsip_operation_handle_t *operation = va_arg(*app, tsip_operation_handle_t *); + + /* create FSM */ + dialog->fsm = TSK_FSM_CREATE(_fsm_state_Started, _fsm_state_Terminated); + dialog->fsm->debug = DEBUG_STATE_MACHINE; + tsk_fsm_set_callback_terminated(dialog->fsm, TSK_FSM_ONTERMINATED(tsip_dialog_publish_OnTerminated), (const void*)dialog); + + /* init base class */ + tsip_dialog_init(TSIP_DIALOG(self), tsip_dialog_publish, stack, 0, operation); + + /* init the class itself */ + tsip_dialog_publish_init(self); + } + return self; +} + +static void* tsip_dialog_publish_destroy(void * self) +{ + tsip_dialog_publish_t *dialog = self; + if(dialog) + { + /* deinit base class */ + tsip_dialog_deinit(TSIP_DIALOG(self)); + + /* FSM */ + TSK_OBJECT_SAFE_FREE(dialog->fsm); + + /* deinit self*/ + TSK_FREE(dialog->etag); + } + return self; +} + +static int tsip_dialog_publish_cmp(const void *dialog1, const void *dialog2) +{ + return tsip_dialog_cmp(dialog1, dialog2); +} + +static const tsk_object_def_t tsip_dialog_publish_def_s = +{ + sizeof(tsip_dialog_publish_t), + tsip_dialog_publish_create, + tsip_dialog_publish_destroy, + tsip_dialog_publish_cmp, +}; +const void *tsip_dialog_publish_def_t = &tsip_dialog_publish_def_s; \ No newline at end of file diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_register.client.c b/trunk/tinySIP/src/dialogs/tsip_dialog_register.client.c index eda9325e..66c40a7b 100644 --- a/trunk/tinySIP/src/dialogs/tsip_dialog_register.client.c +++ b/trunk/tinySIP/src/dialogs/tsip_dialog_register.client.c @@ -216,8 +216,7 @@ int tsip_dialog_register_timer_callback(const tsip_dialog_register_t* self, tsk_ if(self) { - if(timer_id == self->timerrefresh.id) - { + if(timer_id == self->timerrefresh.id){ ret = tsk_fsm_act((self)->fsm, _fsm_action_refresh, self, TSK_NULL, self, TSK_NULL); } } @@ -335,6 +334,8 @@ int tsip_dialog_register_Started_2_Trying_X_send(va_list *app) tsip_dialog_register_t *self = va_arg(*app, tsip_dialog_register_t *); const tsip_message_t *message = va_arg(*app, const tsip_message_t *); + TSIP_DIALOG(self)->running = 1; + return send_register(self, TSIP_TRUE); } diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_subscribe.client.c b/trunk/tinySIP/src/dialogs/tsip_dialog_subscribe.client.c index 45aeee48..e9c8e020 100644 --- a/trunk/tinySIP/src/dialogs/tsip_dialog_subscribe.client.c +++ b/trunk/tinySIP/src/dialogs/tsip_dialog_subscribe.client.c @@ -38,6 +38,9 @@ #include "tsk_debug.h" #include "tsk_time.h" +/**@defgroup tsip_dialog_subscribe_group SIP dialog SUBSCRIBE (Client side) as per RFC 3265. +*/ + #define DEBUG_STATE_MACHINE 1 #define TSIP_DIALOG_SUBSCRIBE_TIMER_SCHEDULE(TX) TSIP_DIALOG_TIMER_SCHEDULE(subscribe, TX) #define TSIP_DIALOG_SUBSCRIBE_SIGNAL(self, type, code, phrase, message) \ @@ -123,13 +126,7 @@ typedef enum _fsm_state_e _fsm_state_t; /** - * @fn int tsip_dialog_subscribe_event_callback(const tsip_dialog_subscribe_t *self, tsip_dialog_event_type_t type, - * const tsip_message_t *msg) - * - * @brief Callback function called to alert the dialog for new events from the transaction/transport layers. - * - * @author Mamadou - * @date 1/4/2010 + * Callback function called to alert the dialog for new events from the transaction/transport layers. * * @param [in,out] self A reference to the dialog. * @param type The event type. @@ -150,24 +147,19 @@ int tsip_dialog_subscribe_event_callback(const tsip_dialog_subscribe_t *self, ts // // RESPONSE // - if(TSIP_RESPONSE_IS_1XX(msg)) - { + if(TSIP_RESPONSE_IS_1XX(msg)){ ret = tsk_fsm_act(self->fsm, _fsm_action_1xx, self, msg, self, msg); } - else if(TSIP_RESPONSE_IS_2XX(msg)) - { + else if(TSIP_RESPONSE_IS_2XX(msg)){ ret = tsk_fsm_act(self->fsm, _fsm_action_2xx, self, msg, self, msg); } - else if(TSIP_RESPONSE_IS(msg,401) || TSIP_RESPONSE_IS(msg,407) || TSIP_RESPONSE_IS(msg,421) || TSIP_RESPONSE_IS(msg,494)) - { + else if(TSIP_RESPONSE_IS(msg,401) || TSIP_RESPONSE_IS(msg,407) || TSIP_RESPONSE_IS(msg,421) || TSIP_RESPONSE_IS(msg,494)){ ret = tsk_fsm_act(self->fsm, _fsm_action_401_407_421_494, self, msg, self, msg); } - else if(TSIP_RESPONSE_IS(msg,423)) - { + else if(TSIP_RESPONSE_IS(msg,423)){ ret = tsk_fsm_act(self->fsm, _fsm_action_423, self, msg, self, msg); } - else - { + else{ // Alert User ret = tsk_fsm_act(self->fsm, _fsm_action_error, self, msg, self, msg); TSK_DEBUG_WARN("Not supported status code: %d", TSIP_RESPONSE_CODE(msg)); @@ -181,9 +173,13 @@ int tsip_dialog_subscribe_event_callback(const tsip_dialog_subscribe_t *self, ts if(tsk_striequals(TSIP_REQUEST_METHOD(msg), "NOTIFY")){ ret = tsk_fsm_act((self)->fsm, _fsm_action_notify, self, msg, self, msg); } - else - { - // FIXME: send something + else{ + if(tsk_striequals(TSIP_REQUEST_METHOD(msg), "SUBSCRIBE")){ + // FIXME: send loop detected + } + else{ + // FIXME: Method not suported + } } } break; @@ -234,8 +230,7 @@ int tsip_dialog_subscribe_timer_callback(const tsip_dialog_subscribe_t* self, ts if(self) { - if(timer_id == self->timerrefresh.id) - { + if(timer_id == self->timerrefresh.id){ tsk_fsm_act(self->fsm, _fsm_action_refresh, self, TSK_NULL, self, TSK_NULL); ret = 0; } @@ -308,8 +303,8 @@ int tsip_dialog_subscribe_init(tsip_dialog_subscribe_t *self) TSK_FSM_ADD_ALWAYS(tsk_fsm_state_any, _fsm_action_transporterror, _fsm_state_Terminated, tsip_dialog_subscribe_Any_2_Terminated_X_transportError, "tsip_dialog_subscribe_Any_2_Terminated_X_transportError"), // Any -> (transport error) -> Terminated TSK_FSM_ADD_ALWAYS(tsk_fsm_state_any, _fsm_action_error, _fsm_state_Terminated, tsip_dialog_subscribe_Any_2_Terminated_X_Error, "tsip_dialog_subscribe_Any_2_Terminated_X_Error"), - // Any -> (hangup) -> Terminated // Any -> (hangup) -> Trying + TSK_FSM_ADD_ALWAYS(tsk_fsm_state_any, _fsm_action_hangup, _fsm_state_Trying, tsip_dialog_subscribe_Any_2_Trying_X_hangup, "tsip_dialog_subscribe_Any_2_Trying_X_hangup"), TSK_FSM_ADD_NULL()); @@ -344,6 +339,8 @@ int tsip_dialog_subscribe_Started_2_Trying_X_send(va_list *app) tsip_dialog_subscribe_t *self = va_arg(*app, tsip_dialog_subscribe_t *); const tsip_response_t *response = va_arg(*app, const tsip_response_t *); + TSIP_DIALOG(self)->running = 1; + return send_subscribe(self); } @@ -399,8 +396,7 @@ int tsip_dialog_subscribe_Trying_2_Trying_X_401_407_421_494(va_list *app) tsip_dialog_subscribe_t *self = va_arg(*app, tsip_dialog_subscribe_t *); const tsip_response_t *response = va_arg(*app, const tsip_response_t *); - if(tsip_dialog_update(TSIP_DIALOG(self), response)) - { + if(tsip_dialog_update(TSIP_DIALOG(self), response)){ /* Alert the user. */ TSIP_DIALOG_SUBSCRIBE_SIGNAL(self, self->unsubscribing ? tsip_ao_unsubscribe : tsip_ao_subscribe, TSIP_RESPONSE_CODE(response), TSIP_RESPONSE_PHRASE(response), response); @@ -430,13 +426,11 @@ int tsip_dialog_subscribe_Trying_2_Trying_X_423(va_list *app) (Interval Too Brief) response. */ hdr = (tsip_header_Min_Expires_t*)tsip_message_get_header(response, tsip_htype_Min_Expires); - if(hdr) - { + if(hdr){ TSIP_DIALOG(self)->expires = hdr->value; send_subscribe(self); } - else - { + else{ TSIP_DIALOG_SUBSCRIBE_SIGNAL(self, self->unsubscribing ? tsip_ao_unsubscribe : tsip_ao_subscribe, 715, "Invalid SIP response.", response); @@ -501,7 +495,7 @@ int tsip_dialog_subscribe_Connected_2_Trying_X_refresh(va_list *app) tsip_dialog_subscribe_t *self = va_arg(*app, tsip_dialog_subscribe_t *); const tsip_response_t *response = va_arg(*app, const tsip_response_t *); - return 0; + return send_subscribe(self); } /* Connected -> (NOTIFY) -> Connected @@ -574,12 +568,7 @@ int tsip_dialog_subscribe_Any_2_Terminated_X_Error(va_list *app) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++ /** - * @fn int send_subscribe(tsip_dialog_subscribe_t *self) - * - * @brief Sends a SUBSCRIBE request. - * - * @author Mamadou - * @date 1/4/2010 + * Sends a SUBSCRIBE request. * * @param [in,out] self The caller. * @@ -615,12 +604,7 @@ int send_notify_200ok(tsip_dialog_subscribe_t *self, const tsip_request_t* reque } /** - * @fn int tsip_dialog_subscribe_OnTerminated(tsip_dialog_subscribe_t *self) - * - * @brief Callback function called by the state machine manager to signal that the final state has been reached. - * - * @author Mamadou - * @date 1/5/2010 + * Callback function called by the state machine manager to signal that the final state has been reached. * * @param [in,out] self The state machine owner. **/ diff --git a/trunk/tinySIP/src/headers/tsip_header_Allow_Events.c b/trunk/tinySIP/src/headers/tsip_header_Allow_Events.c index 766f7c84..ce5de39b 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Allow_Events.c +++ b/trunk/tinySIP/src/headers/tsip_header_Allow_Events.c @@ -313,8 +313,6 @@ _again: // Allow_events header object definition // -/**@ingroup tsip_header_Allow_events_group -*/ static void* tsip_header_Allow_Events_create(void *self, va_list * app) { tsip_header_Allow_Events_t *Allow_events = self; @@ -330,8 +328,6 @@ static void* tsip_header_Allow_Events_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Allow_events_group -*/ static void* tsip_header_Allow_Events_destroy(void *self) { tsip_header_Allow_Events_t *Allow_events = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_CSeq.c b/trunk/tinySIP/src/headers/tsip_header_CSeq.c index 335489ca..89550bc7 100644 --- a/trunk/tinySIP/src/headers/tsip_header_CSeq.c +++ b/trunk/tinySIP/src/headers/tsip_header_CSeq.c @@ -286,8 +286,6 @@ _again: // CSeq header object definition // -/**@ingroup tsip_header_CSeq_group -*/ static void* tsip_header_CSeq_create(void *self, va_list * app) { tsip_header_CSeq_t *CSeq = self; @@ -305,8 +303,6 @@ static void* tsip_header_CSeq_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_CSeq_group -*/ static void* tsip_header_CSeq_destroy(void *self) { tsip_header_CSeq_t *CSeq = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Call_ID.c b/trunk/tinySIP/src/headers/tsip_header_Call_ID.c index fa9a200d..f038dd2c 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Call_ID.c +++ b/trunk/tinySIP/src/headers/tsip_header_Call_ID.c @@ -295,8 +295,6 @@ _again: // Call_ID header object definition // -/**@ingroup tsip_header_Call_ID_group -*/ static void* tsip_header_Call_ID_create(void *self, va_list * app) { tsip_header_Call_ID_t *Call_ID = self; @@ -313,8 +311,6 @@ static void* tsip_header_Call_ID_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Call_ID_group -*/ static void* tsip_header_Call_ID_destroy(void *self) { tsip_header_Call_ID_t *Call_ID = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Contact.c b/trunk/tinySIP/src/headers/tsip_header_Contact.c index 9286f9f2..7d1c0d7a 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Contact.c +++ b/trunk/tinySIP/src/headers/tsip_header_Contact.c @@ -642,8 +642,6 @@ _again: // Contact header object definition // -/**@ingroup tsip_header_Contact_group -*/ static void* tsip_header_Contact_create(void *self, va_list * app) { tsip_header_Contact_t *Contact = self; @@ -660,8 +658,6 @@ static void* tsip_header_Contact_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Contact_group -*/ static void* tsip_header_Contact_destroy(void *self) { tsip_header_Contact_t *Contact = self; @@ -707,8 +703,6 @@ const void *tsip_header_Contact_def_t = &tsip_header_Contact_def_s; // return self; //} // -///**@ingroup tsip_header_Contact_group -//*/ //static void* tsip_contact_destroy(void *self) //{ // tsip_contact_t *contact = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Content_Length.c b/trunk/tinySIP/src/headers/tsip_header_Content_Length.c index 172118a4..f8a23ac0 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Content_Length.c +++ b/trunk/tinySIP/src/headers/tsip_header_Content_Length.c @@ -273,8 +273,6 @@ _again: // Content_Length header object definition // -/**@ingroup tsip_header_Content_Length_group -*/ static void* tsip_header_Content_Length_create(void *self, va_list * app) { tsip_header_Content_Length_t *Content_Length = self; @@ -292,8 +290,6 @@ static void* tsip_header_Content_Length_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Content_Length_group -*/ static void* tsip_header_Content_Length_destroy(void *self) { tsip_header_Content_Length_t *Content_Length = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Content_Type.c b/trunk/tinySIP/src/headers/tsip_header_Content_Type.c index 6e15e39d..58890125 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Content_Type.c +++ b/trunk/tinySIP/src/headers/tsip_header_Content_Type.c @@ -383,8 +383,6 @@ _again: // Content_Type header object definition // -/**@ingroup tsip_header_Content_Type_group -*/ static void* tsip_header_Content_Type_create(void *self, va_list * app) { tsip_header_Content_Type_t *Content_Type = self; @@ -402,8 +400,6 @@ static void* tsip_header_Content_Type_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Content_Type_group -*/ static void* tsip_header_Content_Type_destroy(void *self) { tsip_header_Content_Type_t *Content_Type = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Dummy.c b/trunk/tinySIP/src/headers/tsip_header_Dummy.c index 52e872d7..8b16888b 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Dummy.c +++ b/trunk/tinySIP/src/headers/tsip_header_Dummy.c @@ -278,8 +278,6 @@ _again: // Dummy header object definition // -/**@ingroup tsip_header_Dummy_group -*/ static void* tsip_header_Dummy_create(void *self, va_list * app) { tsip_header_Dummy_t *Dummy = self; @@ -298,8 +296,6 @@ static void* tsip_header_Dummy_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Dummy_group -*/ static void* tsip_header_Dummy_destroy(void *self) { tsip_header_Dummy_t *Dummy = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Event.c b/trunk/tinySIP/src/headers/tsip_header_Event.c index 569141dd..b29ebc05 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Event.c +++ b/trunk/tinySIP/src/headers/tsip_header_Event.c @@ -425,8 +425,6 @@ _again: // Event header object definition // -/**@ingroup tsip_header_Event_group -*/ static void* tsip_header_Event_create(void *self, va_list * app) { tsip_header_Event_t *Event = self; @@ -443,8 +441,6 @@ static void* tsip_header_Event_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Event_group -*/ static void* tsip_header_Event_destroy(void *self) { tsip_header_Event_t *Event = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Expires.c b/trunk/tinySIP/src/headers/tsip_header_Expires.c index 6d91eb16..c727885c 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Expires.c +++ b/trunk/tinySIP/src/headers/tsip_header_Expires.c @@ -267,8 +267,6 @@ _again: // Expires header object definition // -/**@ingroup tsip_header_Expires_group -*/ static void* tsip_header_Expires_create(void *self, va_list * app) { tsip_header_Expires_t *Expires = self; @@ -285,8 +283,6 @@ static void* tsip_header_Expires_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Expires_group -*/ static void* tsip_header_Expires_destroy(void *self) { tsip_header_Expires_t *Expires = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_From.c b/trunk/tinySIP/src/headers/tsip_header_From.c index c439b474..49082d00 100644 --- a/trunk/tinySIP/src/headers/tsip_header_From.c +++ b/trunk/tinySIP/src/headers/tsip_header_From.c @@ -533,8 +533,6 @@ _again: // From header object definition // -/**@ingroup tsip_header_From_group -*/ static void* tsip_header_From_create(void *self, va_list * app) { tsip_header_From_t *From = self; @@ -558,8 +556,6 @@ static void* tsip_header_From_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_From_group -*/ static void* tsip_header_From_destroy(void *self) { tsip_header_From_t *From = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Max_Forwards.c b/trunk/tinySIP/src/headers/tsip_header_Max_Forwards.c index 0e667347..0dce4a3c 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Max_Forwards.c +++ b/trunk/tinySIP/src/headers/tsip_header_Max_Forwards.c @@ -276,8 +276,6 @@ _again: // Max_Forwards header object definition // -/**@ingroup tsip_header_Max_Forwards_group -*/ static void* tsip_header_Max_Forwards_create(void *self, va_list * app) { tsip_header_Max_Forwards_t *Max_Forwards = self; @@ -294,8 +292,6 @@ static void* tsip_header_Max_Forwards_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Max_Forwards_group -*/ static void* tsip_header_Max_Forwards_destroy(void *self) { tsip_header_Max_Forwards_t *Max_Forwards = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Min_Expires.c b/trunk/tinySIP/src/headers/tsip_header_Min_Expires.c index ad132566..91fe9bf9 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Min_Expires.c +++ b/trunk/tinySIP/src/headers/tsip_header_Min_Expires.c @@ -276,8 +276,6 @@ _again: // Min-Expires header object definition // -/**@ingroup tsip_header_Min_Expires_group -*/ static void* tsip_header_Min_Expires_create(void *self, va_list * app) { tsip_header_Min_Expires_t *Min_Expires = self; @@ -294,8 +292,6 @@ static void* tsip_header_Min_Expires_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Min_Expires_group -*/ static void* tsip_header_Min_Expires_destroy(void *self) { tsip_header_Min_Expires_t *Min_Expires = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Access_Network_Info.c b/trunk/tinySIP/src/headers/tsip_header_P_Access_Network_Info.c index 7c5fe65f..9fc6fff3 100644 --- a/trunk/tinySIP/src/headers/tsip_header_P_Access_Network_Info.c +++ b/trunk/tinySIP/src/headers/tsip_header_P_Access_Network_Info.c @@ -296,8 +296,6 @@ _again: // P_Access_Network_Info header object definition // -/**@ingroup tsip_header_P_Access_Network_Info_group -*/ static void* tsip_header_P_Access_Network_Info_create(void *self, va_list * app) { tsip_header_P_Access_Network_Info_t *P_Access_Network_Info = self; @@ -314,8 +312,6 @@ static void* tsip_header_P_Access_Network_Info_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_P_Access_Network_Info_group -*/ static void* tsip_header_P_Access_Network_Info_destroy(void *self) { tsip_header_P_Access_Network_Info_t *P_Access_Network_Info = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Asserted_Identity.c b/trunk/tinySIP/src/headers/tsip_header_P_Asserted_Identity.c index caec6b41..dfb3095b 100644 --- a/trunk/tinySIP/src/headers/tsip_header_P_Asserted_Identity.c +++ b/trunk/tinySIP/src/headers/tsip_header_P_Asserted_Identity.c @@ -102,81 +102,32 @@ static const short _tsip_machine_parser_header_P_Asserted_Identity_key_offsets[] 280, 285, 285, 289, 307, 323, 340, 345, 353, 366, 371, 375, 380, 399, 416, 434, 440, 449, 468, 475, 482, 489, 496, 503, - 509, 548, 570, 572, 575, 597, 599, 602, - 606, 611, 629, 648, 653, 655, 658, 675, - 678, 681, 684, 687, 690, 692, 695, 700, - 707, 728, 748, 754, 755, 791, 828, 833, - 834, 836, 840, 849, 869, 909, 947, 966, - 984, 990, 996, 1002, 1008, 1014, 1019, 1057, - 1092, 1128, 1136, 1155, 1193, 1229, 1249, 1268, - 1273, 1273, 1277, 1297, 1313, 1330, 1335, 1343, - 1356, 1361, 1365, 1370, 1391, 1408, 1426, 1432, - 1441, 1460, 1467, 1474, 1481, 1488, 1495, 1501, - 1540, 1576, 1613, 1622, 1642, 1682, 1720, 1739, - 1744, 1765, 1782, 1800, 1806, 1815, 1819, 1839, - 1855, 1872, 1877, 1885, 1898, 1903, 1907, 1912, - 1933, 1950, 1968, 1974, 1983, 2002, 2009, 2016, - 2023, 2030, 2037, 2043, 2082, 2103, 2122, 2129, - 2136, 2143, 2150, 2157, 2196, 2232, 2269, 2278, - 2298, 2338, 2376, 2395, 2402, 2421, 2428, 2435, - 2442, 2449, 2455, 2461, 2470, 2509, 2545, 2582, - 2587, 2607, 2623, 2640, 2645, 2653, 2666, 2671, - 2675, 2680, 2699, 2716, 2734, 2740, 2749, 2753, - 2772, 2779, 2786, 2793, 2800, 2807, 2813, 2852, - 2874, 2876, 2879, 2901, 2922, 2942, 2948, 2949, - 2985, 3022, 3028, 3030, 3033, 3038, 3060, 3062, - 3065, 3087, 3108, 3128, 3134, 3135, 3140, 3159, - 3176, 3194, 3200, 3209, 3223, 3229, 3234, 3253, - 3260, 3267, 3274, 3281, 3288, 3294, 3333, 3369, - 3406, 3415, 3435, 3474, 3511, 3520, 3540, 3580, - 3618, 3637, 3655, 3661, 3667, 3673, 3679, 3685, - 3690, 3728, 3763, 3799, 3807, 3845, 3881, 3901, - 3919, 3925, 3929, 3947, 3965, 3971, 3977, 3983, - 3989, 3995, 4033, 4068, 4104, 4112, 4150, 4186, - 4195, 4215, 4222, 4241, 4248, 4255, 4262, 4269, - 4275, 4314, 4350, 4387, 4396, 4416, 4456, 4494, - 4513, 4520, 4539, 4546, 4553, 4560, 4567, 4573, - 4579, 4588, 4602, 4608, 4647, 4683, 4720, 4729, - 4769, 4807, 4826, 4865, 4885, 4924, 4960, 4997, - 5037, 5075, 5115, 5153, 5172, 5211, 5231, 5270, - 5306, 5343, 5363, 5370, 5389, 5396, 5403, 5410, - 5417, 5456, 5492, 5529, 5538, 5578, 5616, 5635, - 5674, 5714, 5752, 5773, 5792, 5799, 5804, 5825, - 5844, 5851, 5858, 5865, 5872, 5879, 5918, 5954, - 5991, 5997, 6018, 6035, 6053, 6059, 6068, 6082, - 6088, 6093, 6112, 6119, 6126, 6133, 6140, 6147, - 6153, 6192, 6228, 6265, 6274, 6314, 6352, 6371, - 6392, 6411, 6418, 6423, 6442, 6461, 6468, 6475, - 6482, 6489, 6496, 6535, 6556, 6575, 6582, 6589, - 6596, 6603, 6610, 6649, 6685, 6722, 6731, 6770, - 6807, 6828, 6847, 6854, 6859, 6878, 6897, 6904, - 6911, 6918, 6925, 6932, 6971, 7007, 7044, 7053, - 7092, 7129, 7165, 7202, 7211, 7251, 7289, 7308, - 7317, 7337, 7346, 7386, 7424, 7443, 7482, 7502, - 7509, 7528, 7535, 7542, 7549, 7556, 7595, 7616, - 7635, 7642, 7649, 7656, 7663, 7670, 7709, 7745, - 7782, 7791, 7831, 7869, 7888, 7895, 7914, 7921, - 7928, 7935, 7942, 7981, 8017, 8054, 8063, 8103, - 8141, 8160, 8199, 8238, 8274, 8311, 8351, 8389, - 8410, 8429, 8436, 8472, 8509, 8518, 8558, 8596, - 8615, 8654, 8675, 8694, 8701, 8706, 8727, 8763, - 8800, 8840, 8878, 8897, 8936, 8972, 9009, 9049, - 9087, 9105, 9111, 9117, 9123, 9129, 9135, 9140, - 9178, 9213, 9249, 9257, 9276, 9315, 9352, 9370, - 9376, 9394, 9400, 9406, 9412, 9418, 9456, 9491, - 9527, 9535, 9574, 9611, 9629, 9667, 9686, 9724, - 9759, 9795, 9834, 9871, 9891, 9909, 9915, 9919, - 9939, 9953, 9959, 9964, 9985, 10004, 10011, 10016, - 10037, 10054, 10072, 10093, 10112, 10119, 10158, 10194, - 10231, 10251, 10291, 10329, 10350, 10369, 10376, 10381, - 10402, 10419, 10437, 10458, 10477, 10484, 10502, 10508, - 10514, 10520, 10526, 10532, 10537, 10575, 10610, 10646, - 10654, 10673, 10712, 10749, 10767, 10773, 10791, 10797, - 10803, 10809, 10815, 10820, 10825, 10833, 10846, 10851, - 10855, 10893, 10928, 10964, 10972, 11011, 11048, 11066, - 11104, 11142, 11177, 11213, 11232, 11271, 11308, 11328, - 11346, 11352, 11356, 11376, 11392, 11409, 11429, 11447, - 11453 + 509, 548, 584, 621, 630, 650, 689, 726, + 744, 750, 756, 762, 768, 774, 779, 817, + 852, 888, 896, 915, 953, 989, 1009, 1028, + 1033, 1033, 1037, 1057, 1073, 1090, 1095, 1103, + 1116, 1121, 1125, 1130, 1151, 1168, 1186, 1192, + 1201, 1220, 1227, 1234, 1241, 1248, 1255, 1261, + 1300, 1336, 1373, 1382, 1402, 1442, 1480, 1499, + 1506, 1525, 1532, 1539, 1546, 1553, 1592, 1628, + 1665, 1674, 1714, 1752, 1758, 1762, 1780, 1798, + 1804, 1810, 1816, 1822, 1828, 1866, 1901, 1937, + 1945, 1983, 2019, 2027, 2040, 2045, 2049, 2054, + 2073, 2090, 2108, 2114, 2123, 2127, 2147, 2163, + 2180, 2185, 2203, 2209, 2215, 2221, 2227, 2233, + 2238, 2276, 2311, 2347, 2355, 2374, 2412, 2448, + 2468, 2486, 2505, 2512, 2519, 2526, 2533, 2540, + 2546, 2585, 2621, 2658, 2667, 2687, 2726, 2763, + 2769, 2771, 2774, 2778, 2783, 2784, 2789, 2808, + 2825, 2843, 2849, 2858, 2872, 2878, 2883, 2902, + 2909, 2916, 2923, 2930, 2937, 2943, 2982, 3018, + 3055, 3064, 3084, 3123, 3160, 3179, 3218, 3239, + 3260, 3279, 3286, 3291, 3311, 3350, 3390, 3428, + 3446, 3452, 3458, 3464, 3470, 3476, 3481, 3519, + 3554, 3590, 3598, 3617, 3656, 3693, 3711, 3717, + 3735, 3741, 3747, 3753, 3759, 3797, 3832, 3868, + 3876, 3915, 3952, 3970, 4008, 4028, 4048, 4066, + 4072, 4076, 4095, 4133, 4172, 4209 }; static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = { @@ -249,58 +200,28 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 96, 97, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 60, 62, 126, 42, 43, - 45, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 10, 62, 9, 32, 62, 9, - 13, 32, 33, 34, 37, 39, 60, 62, - 126, 42, 43, 45, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 10, 62, 9, - 32, 62, 9, 32, 60, 62, 62, 65, - 90, 97, 122, 9, 13, 32, 33, 37, - 39, 62, 126, 42, 43, 45, 46, 48, - 57, 65, 90, 95, 122, 9, 13, 32, - 33, 37, 39, 60, 62, 126, 42, 43, - 45, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 60, 62, 10, 62, 9, - 32, 62, 9, 13, 34, 62, 92, -64, + 34, 37, 39, 44, 47, 62, 92, 126, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 122, 123, 125, + 9, 13, 32, 33, 34, 37, 39, 44, + 47, 60, 62, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 122, 123, 125, 9, 13, 32, + 44, 62, 0, 8, 11, 127, 9, 13, + 32, 34, 44, 60, 62, 92, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 33, 126, 9, 13, 32, 33, 34, 37, + 39, 42, 44, 47, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, - -3, 32, 126, 62, -128, -65, 62, -128, - -65, 62, -128, -65, 62, -128, -65, 62, - -128, -65, 10, 62, 9, 32, 62, 9, - 13, 32, 60, 62, 62, 0, 9, 11, - 12, 14, 127, 9, 13, 32, 33, 37, - 39, 42, 43, 58, 62, 126, 45, 46, - 48, 57, 65, 90, 95, 96, 97, 122, - 9, 13, 32, 33, 37, 39, 58, 60, - 62, 126, 42, 43, 45, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 58, - 60, 62, 62, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 44, - 60, 10, 9, 32, 9, 32, 44, 60, - 9, 13, 32, 44, 62, 0, 8, 11, - 127, 9, 13, 32, 34, 44, 60, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 33, 34, 37, 39, 42, 44, 47, 58, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 43, - 57, 59, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 58, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 59, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 34, 44, - 62, 92, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 33, 126, 9, 13, + -3, 35, 41, 43, 57, 58, 64, 65, + 90, 91, 94, 95, 96, 97, 122, 123, + 125, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 60, 62, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 122, 123, 125, 9, 13, 32, 34, 44, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, 32, 44, -128, -65, 9, 13, @@ -398,459 +319,6 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = 9, 13, 32, 34, 44, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, 32, 44, 62, - 9, 13, 32, 33, 34, 37, 39, 44, - 60, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 33, 37, 39, 44, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 33, 37, 39, 44, 60, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 44, 60, 62, 9, 13, - 32, 44, 62, 65, 90, 97, 122, 9, - 13, 32, 44, 9, 13, 32, 33, 34, - 37, 39, 44, 60, 126, 42, 46, 48, - 57, 65, 90, 95, 96, 97, 122, 9, - 13, 32, 33, 37, 39, 44, 126, 42, - 46, 48, 57, 65, 90, 95, 122, 9, - 13, 32, 33, 37, 39, 44, 60, 126, - 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 44, 60, 9, 13, 32, - 44, 65, 90, 97, 122, 9, 13, 32, - 44, 58, 43, 46, 48, 57, 65, 90, - 97, 122, 9, 13, 32, 44, 58, 9, - 13, 32, 44, 9, 13, 32, 44, 62, - 9, 13, 32, 33, 34, 37, 39, 44, - 60, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 33, 37, 39, 44, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 33, 37, 39, 44, 60, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 44, 60, 62, 9, 13, - 32, 44, 62, 65, 90, 97, 122, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 60, 62, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 60, 62, 126, 42, 46, 48, - 57, 65, 90, 95, 96, 97, 122, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 60, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 96, - 97, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 44, 62, 0, 8, 11, 127, 9, 13, - 32, 34, 44, 60, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 33, 34, 37, - 39, 42, 44, 47, 58, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 43, 57, 59, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 58, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 59, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 34, 44, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 34, 44, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 60, 62, 9, - 13, 32, 44, 60, 62, 9, 13, 32, - 44, 62, 65, 90, 97, 122, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 44, 60, 9, 13, 32, 33, 34, - 37, 39, 44, 60, 126, 42, 46, 48, - 57, 65, 90, 95, 96, 97, 122, 9, - 13, 32, 33, 37, 39, 44, 126, 42, - 46, 48, 57, 65, 90, 95, 122, 9, - 13, 32, 33, 37, 39, 44, 60, 126, - 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 44, 60, 9, 13, 32, - 44, 65, 90, 97, 122, 9, 13, 32, - 44, 58, 43, 46, 48, 57, 65, 90, - 97, 122, 9, 13, 32, 44, 58, 9, - 13, 32, 44, 9, 13, 32, 44, 62, - 9, 13, 32, 33, 34, 37, 39, 44, - 60, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 33, 37, - 39, 44, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 33, - 37, 39, 44, 60, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 44, 60, 62, 9, 13, 32, 44, - 62, 65, 90, 97, 122, 9, 13, 32, - 44, 9, 13, 32, 34, 44, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 60, 62, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 60, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 96, - 97, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 60, 62, 126, 42, 43, - 45, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 10, 62, 9, 32, 62, 9, - 13, 32, 33, 34, 37, 39, 60, 62, - 126, 42, 43, 45, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 33, 37, 39, 42, 43, 58, 62, 126, - 45, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 33, 37, 39, - 58, 60, 62, 126, 42, 43, 45, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 58, 60, 62, 62, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 44, 60, 62, 10, 62, 9, 32, - 62, 9, 32, 44, 60, 62, 9, 13, - 32, 33, 34, 37, 39, 60, 62, 126, - 42, 43, 45, 46, 48, 57, 65, 90, - 95, 96, 97, 122, 10, 62, 9, 32, - 62, 9, 13, 32, 33, 34, 37, 39, - 60, 62, 126, 42, 43, 45, 46, 48, - 57, 65, 90, 95, 96, 97, 122, 9, - 13, 32, 33, 37, 39, 42, 43, 58, - 62, 126, 45, 46, 48, 57, 65, 90, - 95, 96, 97, 122, 9, 13, 32, 33, - 37, 39, 58, 60, 62, 126, 42, 43, - 45, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 58, 60, 62, 62, 9, - 13, 32, 44, 62, 9, 13, 32, 33, - 34, 37, 39, 44, 60, 62, 126, 42, - 46, 48, 57, 65, 90, 95, 122, 9, - 13, 32, 33, 37, 39, 44, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 33, 37, 39, 44, 60, - 62, 126, 42, 46, 48, 57, 65, 90, - 95, 122, 9, 13, 32, 44, 60, 62, - 9, 13, 32, 44, 62, 65, 90, 97, - 122, 9, 13, 32, 44, 58, 62, 43, - 46, 48, 57, 65, 90, 97, 122, 9, - 13, 32, 44, 58, 62, 9, 13, 32, - 44, 62, 9, 13, 32, 34, 44, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 60, 62, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 44, 62, 0, 8, 11, 127, 9, - 13, 32, 34, 44, 60, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 33, 34, - 37, 39, 42, 44, 47, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 43, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 44, 62, 0, 8, 11, 127, - 9, 13, 32, 34, 44, 60, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 33, - 34, 37, 39, 42, 44, 47, 58, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 43, 57, - 59, 64, 65, 90, 91, 94, 95, 96, - 97, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 58, 60, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 59, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 34, 44, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 34, 44, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 126, 9, - 13, 32, 44, -128, -65, 9, 13, 32, - 44, -128, -65, 9, 13, 32, 44, -128, - -65, 9, 13, 32, 44, -128, -65, 9, - 13, 32, 44, -128, -65, 9, 13, 32, - 44, 60, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 44, 0, 8, 11, 127, 9, - 13, 32, 33, 34, 37, 39, 42, 44, - 47, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 43, - 57, 58, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 60, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 37, 39, 42, - 44, 58, 126, 43, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 33, 37, 39, 44, 58, 60, 126, 42, - 46, 48, 57, 65, 90, 95, 122, 9, - 13, 32, 44, 58, 60, 9, 13, 32, - 44, 9, 13, 32, 33, 34, 37, 39, - 44, 60, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 34, 44, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 44, -128, -65, 9, 13, 32, 44, -128, - -65, 9, 13, 32, 44, -128, -65, 9, - 13, 32, 44, -128, -65, 9, 13, 32, - 44, -128, -65, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 44, 0, 8, 11, 127, - 9, 13, 32, 33, 34, 37, 39, 42, - 44, 47, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 43, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 44, 62, 0, - 8, 11, 127, 9, 13, 32, 34, 44, - 60, 62, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 126, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 34, 44, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 60, 62, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 44, 62, - 0, 8, 11, 127, 9, 13, 32, 34, - 44, 60, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 33, 34, 37, 39, 42, - 44, 47, 58, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 43, 57, 59, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 58, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 59, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 34, 44, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 34, 44, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 60, 62, 9, 13, 32, - 44, 60, 62, 9, 13, 32, 44, 62, - 65, 90, 97, 122, 9, 13, 32, 44, - 58, 62, 43, 46, 48, 57, 65, 90, - 97, 122, 9, 13, 32, 44, 58, 62, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 44, 62, 0, 8, 11, - 127, 9, 13, 32, 33, 34, 37, 39, - 42, 44, 47, 58, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 43, 57, 59, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 58, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 59, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 34, 44, 60, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 60, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 96, - 97, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 42, 44, 47, 58, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 43, - 57, 59, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 58, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 59, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 42, 44, 47, 58, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 43, 57, 59, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 58, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 59, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 34, 44, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 34, 44, - 60, 62, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 126, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 34, 44, 60, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 44, 62, -128, -65, 9, 13, 32, 34, 44, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, 32, @@ -882,447 +350,16 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 59, 64, 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 34, 44, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 42, 44, 47, 58, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 43, 57, 59, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 58, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 59, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 33, 37, 39, 42, 44, - 58, 62, 126, 43, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 33, 37, 39, 44, 58, 60, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 44, 58, 60, 62, 9, - 13, 32, 44, 62, 9, 13, 32, 33, - 34, 37, 39, 44, 60, 62, 126, 42, - 46, 48, 57, 65, 90, 95, 96, 97, - 122, 9, 13, 32, 34, 44, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 44, 60, 62, 9, 13, 32, - 33, 34, 37, 39, 44, 60, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 33, 37, 39, - 44, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 33, 37, - 39, 44, 60, 62, 126, 42, 46, 48, - 57, 65, 90, 95, 122, 9, 13, 32, - 44, 60, 62, 9, 13, 32, 44, 62, - 65, 90, 97, 122, 9, 13, 32, 44, - 58, 62, 43, 46, 48, 57, 65, 90, - 97, 122, 9, 13, 32, 44, 58, 62, - 9, 13, 32, 44, 62, 9, 13, 32, - 34, 44, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 60, - 62, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 44, 62, 0, 8, - 11, 127, 9, 13, 32, 33, 34, 37, - 39, 42, 44, 47, 58, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 43, 57, 59, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 58, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 59, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 34, 44, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 33, 37, - 39, 42, 44, 58, 62, 126, 43, 46, - 48, 57, 65, 90, 95, 96, 97, 122, - 9, 13, 32, 33, 37, 39, 44, 58, - 60, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 44, 58, - 60, 62, 9, 13, 32, 44, 62, 9, - 13, 32, 33, 34, 37, 39, 44, 60, - 62, 126, 42, 46, 48, 57, 65, 90, - 95, 122, 9, 13, 32, 34, 44, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 60, - 62, 126, 42, 46, 48, 57, 65, 90, - 95, 96, 97, 122, 9, 13, 32, 34, - 44, 62, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 126, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 60, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 44, 62, 0, - 8, 11, 127, 9, 13, 32, 33, 34, - 37, 39, 42, 44, 47, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 43, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 33, 37, 39, 42, 44, 58, - 62, 126, 43, 46, 48, 57, 65, 90, - 95, 96, 97, 122, 9, 13, 32, 33, - 37, 39, 44, 58, 60, 62, 126, 42, - 46, 48, 57, 65, 90, 95, 122, 9, - 13, 32, 44, 58, 60, 62, 9, 13, - 32, 44, 62, 9, 13, 32, 33, 34, - 37, 39, 44, 60, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 34, 44, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 44, - 62, 0, 8, 11, 127, 9, 13, 32, - 33, 34, 37, 39, 42, 44, 47, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 43, 57, - 58, 64, 65, 90, 91, 94, 95, 96, - 97, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 60, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 44, 62, 0, - 8, 11, 127, 9, 13, 32, 33, 34, - 37, 39, 42, 44, 47, 58, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 43, 57, 59, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 58, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 59, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 34, 44, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 44, - 62, 0, 8, 11, 127, 9, 13, 32, - 34, 44, 60, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 44, 62, 0, 8, - 11, 127, 9, 13, 32, 33, 34, 37, - 39, 42, 44, 47, 58, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 43, 57, 59, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 58, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 59, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 34, 44, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 34, 44, 60, - 62, 92, -64, -33, -32, -17, -16, -9, + 9, 13, 32, 44, 58, 60, 9, 13, + 32, 44, 9, 13, 32, 33, 34, 37, + 39, 44, 60, 126, 42, 46, 48, 57, + 65, 90, 95, 122, 9, 13, 32, 34, + 44, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 34, 44, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 60, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 96, 97, 122, - 9, 13, 32, 34, 44, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 44, 62, 0, 8, 11, 127, 9, - 13, 32, 33, 34, 37, 39, 42, 44, - 47, 58, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 43, 57, 59, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 58, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 59, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 34, 44, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 44, 62, 0, 8, 11, 127, 9, - 13, 32, 33, 34, 37, 39, 42, 44, - 47, 58, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 43, 57, 59, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 58, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 59, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 34, 44, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 42, 44, - 47, 58, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 43, 57, 59, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 58, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 59, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 33, 37, 39, 42, 44, 58, 62, 126, - 43, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 33, 37, 39, - 44, 58, 60, 62, 126, 42, 46, 48, - 57, 65, 90, 95, 122, 9, 13, 32, - 44, 58, 60, 62, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 44, 62, 0, 8, 11, 127, 9, 13, - 32, 33, 34, 37, 39, 42, 44, 47, - 58, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 43, 57, 59, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 58, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 59, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 34, - 44, 62, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 126, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 37, 39, 42, 44, 58, 62, - 126, 43, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 9, 13, 32, 33, 37, - 39, 44, 58, 60, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 44, 58, 60, 62, 9, 13, 32, - 44, 62, 9, 13, 32, 33, 34, 37, - 39, 44, 60, 62, 126, 42, 46, 48, - 57, 65, 90, 95, 96, 97, 122, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 42, - 44, 47, 58, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 43, 57, 59, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 58, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 59, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 34, 44, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 42, 44, 47, 58, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 43, 57, 59, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 58, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 59, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 34, 44, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 44, -128, -65, 9, - 13, 32, 44, -128, -65, 9, 13, 32, - 44, -128, -65, 9, 13, 32, 44, -128, - -65, 9, 13, 32, 44, -128, -65, 9, - 13, 32, 44, 60, 9, 13, 32, 33, + 32, 44, -128, -65, 9, 13, 32, 44, + -128, -65, 9, 13, 32, 44, -128, -65, + 9, 13, 32, 44, -128, -65, 9, 13, + 32, 44, -128, -65, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, @@ -1337,60 +374,43 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 122, 123, 125, 9, 13, 32, 44, 0, 8, 11, - 127, 9, 13, 32, 34, 44, 60, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 33, - 34, 37, 39, 42, 44, 47, 58, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 43, 57, 59, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 58, 60, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 59, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 34, 44, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 44, -128, -65, - 9, 13, 32, 34, 44, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 44, -128, -65, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, -128, -65, 9, 13, 32, 44, - -128, -65, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 44, 0, 8, 11, 127, 9, - 13, 32, 33, 34, 37, 39, 42, 44, - 47, 58, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 43, 57, 59, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 58, + 127, 9, 13, 32, 33, 34, 37, 39, + 42, 44, 47, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 43, 57, 58, 64, 65, 90, 91, + 94, 95, 96, 97, 122, 123, 125, 9, + 13, 32, 33, 34, 37, 39, 44, 47, 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, - 57, 59, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 34, 44, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 60, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 34, 44, - 60, 92, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 33, 126, 9, 13, + 57, 58, 64, 65, 90, 91, 94, 95, + 122, 123, 125, 9, 13, 32, 44, 65, + 90, 97, 122, 9, 13, 32, 44, 58, + 43, 46, 48, 57, 65, 90, 97, 122, + 9, 13, 32, 44, 58, 9, 13, 32, + 44, 9, 13, 32, 44, 62, 9, 13, + 32, 33, 34, 37, 39, 44, 60, 62, + 126, 42, 46, 48, 57, 65, 90, 95, + 122, 9, 13, 32, 33, 37, 39, 44, + 62, 126, 42, 46, 48, 57, 65, 90, + 95, 122, 9, 13, 32, 33, 37, 39, + 44, 60, 62, 126, 42, 46, 48, 57, + 65, 90, 95, 122, 9, 13, 32, 44, + 60, 62, 9, 13, 32, 44, 62, 65, + 90, 97, 122, 9, 13, 32, 44, 9, + 13, 32, 33, 34, 37, 39, 44, 60, + 126, 42, 46, 48, 57, 65, 90, 95, + 96, 97, 122, 9, 13, 32, 33, 37, + 39, 44, 126, 42, 46, 48, 57, 65, + 90, 95, 122, 9, 13, 32, 33, 37, + 39, 44, 60, 126, 42, 46, 48, 57, + 65, 90, 95, 122, 9, 13, 32, 44, + 60, 9, 13, 32, 34, 44, 92, -64, + -33, -32, -17, -16, -9, -8, -5, -4, + -3, 33, 126, 9, 13, 32, 44, -128, + -65, 9, 13, 32, 44, -128, -65, 9, + 13, 32, 44, -128, -65, 9, 13, 32, + 44, -128, -65, 9, 13, 32, 44, -128, + -65, 9, 13, 32, 44, 60, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, @@ -1404,47 +424,81 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 42, 44, 47, 58, 92, 126, + 122, 123, 125, 9, 13, 32, 44, 0, + 8, 11, 127, 9, 13, 32, 34, 44, + 60, 92, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 33, 126, 9, 13, + 32, 33, 34, 37, 39, 42, 44, 47, + 92, 126, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 35, 41, 43, 57, + 58, 64, 65, 90, 91, 94, 95, 96, + 97, 122, 123, 125, 9, 13, 32, 33, + 34, 37, 39, 44, 47, 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 43, 57, 59, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 58, 60, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 59, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 33, 37, 39, 42, 44, 58, - 126, 43, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 9, 13, 32, 33, 37, - 39, 44, 58, 60, 126, 42, 46, 48, - 57, 65, 90, 95, 122, 9, 13, 32, - 44, 58, 60, 9, 13, 32, 44, 9, - 13, 32, 33, 34, 37, 39, 44, 60, - 126, 42, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 9, 13, 32, 44, 58, - 62, 43, 46, 48, 57, 65, 90, 97, - 122, 9, 13, 32, 44, 58, 62, 9, - 13, 32, 44, 62, 9, 13, 32, 33, - 37, 39, 42, 44, 58, 62, 126, 43, - 46, 48, 57, 65, 90, 95, 96, 97, - 122, 9, 13, 32, 33, 37, 39, 44, - 58, 60, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 44, - 58, 60, 62, 9, 13, 32, 44, 62, - 9, 13, 32, 33, 34, 37, 39, 44, - 60, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 33, 37, 39, 44, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 33, 37, 39, 44, 60, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 122, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 122, 123, 125, 9, 13, 32, 33, 37, 39, 42, 44, - 58, 62, 126, 43, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 33, 37, 39, 44, 58, 60, 62, 126, + 58, 126, 43, 46, 48, 57, 65, 90, + 95, 96, 97, 122, 9, 13, 32, 33, + 37, 39, 44, 58, 60, 126, 42, 46, + 48, 57, 65, 90, 95, 122, 9, 13, + 32, 34, 44, 62, 92, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 33, + 126, 9, 13, 32, 44, 62, -128, -65, + 9, 13, 32, 44, 62, -128, -65, 9, + 13, 32, 44, 62, -128, -65, 9, 13, + 32, 44, 62, -128, -65, 9, 13, 32, + 44, 62, -128, -65, 9, 13, 32, 44, + 60, 62, 9, 13, 32, 33, 34, 37, + 39, 44, 47, 60, 62, 92, 126, -64, + -33, -32, -17, -16, -9, -8, -5, -4, + -3, 35, 41, 42, 57, 58, 64, 65, + 90, 91, 94, 95, 96, 97, 122, 123, + 125, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 62, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 122, 123, 125, 9, 13, 32, + 33, 34, 37, 39, 44, 47, 60, 62, + 92, 126, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 35, 41, 42, 57, + 58, 64, 65, 90, 91, 94, 95, 122, + 123, 125, 9, 13, 32, 44, 62, 0, + 8, 11, 127, 9, 13, 32, 34, 44, + 60, 62, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, + 13, 32, 33, 34, 37, 39, 42, 44, + 47, 62, 92, 126, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 35, 41, + 43, 57, 58, 64, 65, 90, 91, 94, + 95, 96, 97, 122, 123, 125, 9, 13, + 32, 33, 34, 37, 39, 44, 47, 60, + 62, 92, 126, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 35, 41, 42, + 57, 58, 64, 65, 90, 91, 94, 95, + 122, 123, 125, 9, 13, 32, 58, 60, + 62, 10, 62, 9, 32, 62, 9, 32, + 60, 62, 62, 65, 90, 97, 122, 62, + 9, 13, 32, 44, 62, 9, 13, 32, + 33, 34, 37, 39, 44, 60, 62, 126, 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 44, 58, 60, 62, 9, + 9, 13, 32, 33, 37, 39, 44, 62, + 126, 42, 46, 48, 57, 65, 90, 95, + 122, 9, 13, 32, 33, 37, 39, 44, + 60, 62, 126, 42, 46, 48, 57, 65, + 90, 95, 122, 9, 13, 32, 44, 60, + 62, 9, 13, 32, 44, 62, 65, 90, + 97, 122, 9, 13, 32, 44, 58, 62, + 43, 46, 48, 57, 65, 90, 97, 122, + 9, 13, 32, 44, 58, 62, 9, 13, + 32, 44, 62, 9, 13, 32, 34, 44, + 62, 92, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 33, 126, 9, 13, + 32, 44, 62, -128, -65, 9, 13, 32, + 44, 62, -128, -65, 9, 13, 32, 44, + 62, -128, -65, 9, 13, 32, 44, 62, + -128, -65, 9, 13, 32, 44, 62, -128, + -65, 9, 13, 32, 44, 60, 62, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, @@ -1459,38 +513,53 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 34, 44, 60, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 33, 34, - 37, 39, 42, 44, 47, 58, 62, 92, + 13, 32, 44, 62, 0, 8, 11, 127, + 9, 13, 32, 34, 44, 60, 62, 92, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 33, 126, 9, 13, 32, 33, + 34, 37, 39, 42, 44, 47, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 43, 57, 59, + -5, -4, -3, 35, 41, 43, 57, 58, 64, 65, 90, 91, 94, 95, 96, 97, 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 58, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 59, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 37, 39, 42, - 44, 58, 62, 126, 43, 46, 48, 57, - 65, 90, 95, 96, 97, 122, 9, 13, - 32, 33, 37, 39, 44, 58, 60, 62, - 126, 42, 46, 48, 57, 65, 90, 95, - 122, 9, 13, 32, 44, 58, 60, 62, - 9, 13, 32, 44, 62, 9, 13, 32, - 33, 34, 37, 39, 44, 60, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 33, 37, 39, - 44, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 33, 37, + 37, 39, 44, 47, 60, 62, 92, 126, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 122, 123, 125, + 9, 13, 32, 34, 44, 62, 92, -64, + -33, -32, -17, -16, -9, -8, -5, -4, + -3, 33, 126, 9, 13, 32, 33, 34, + 37, 39, 44, 47, 60, 62, 92, 126, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 96, 97, 122, + 123, 125, 9, 13, 32, 33, 34, 37, 39, 44, 60, 62, 126, 42, 46, 48, - 57, 65, 90, 95, 122, 9, 13, 32, - 33, 37, 39, 42, 44, 58, 62, 126, - 43, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 33, 37, 39, - 44, 58, 60, 62, 126, 42, 46, 48, - 57, 65, 90, 95, 122, 9, 13, 32, - 44, 58, 60, 62, 9, 13, 32, 34, + 57, 65, 90, 95, 96, 97, 122, 9, + 13, 32, 33, 37, 39, 42, 44, 58, + 62, 126, 43, 46, 48, 57, 65, 90, + 95, 96, 97, 122, 9, 13, 32, 33, + 37, 39, 44, 58, 60, 62, 126, 42, + 46, 48, 57, 65, 90, 95, 122, 9, + 13, 32, 44, 58, 60, 62, 9, 13, + 32, 44, 62, 9, 13, 32, 34, 44, + 60, 62, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, + 13, 32, 33, 34, 37, 39, 44, 47, + 60, 62, 92, 126, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 35, 41, + 42, 57, 58, 64, 65, 90, 91, 94, + 95, 96, 97, 122, 123, 125, 9, 13, + 32, 33, 34, 37, 39, 42, 44, 47, + 58, 62, 92, 126, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 35, 41, + 43, 57, 59, 64, 65, 90, 91, 94, + 95, 96, 97, 122, 123, 125, 9, 13, + 32, 33, 34, 37, 39, 44, 47, 58, + 60, 62, 92, 126, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 35, 41, + 42, 57, 59, 64, 65, 90, 91, 94, + 95, 122, 123, 125, 9, 13, 32, 34, 44, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, 32, 44, -128, -65, 9, 13, 32, 44, @@ -1532,11 +601,6 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = 13, 32, 44, -128, -65, 9, 13, 32, 44, -128, -65, 9, 13, 32, 44, -128, -65, 9, 13, 32, 44, -128, -65, 9, - 13, 32, 44, 60, 9, 13, 32, 44, - 60, 9, 13, 32, 44, 65, 90, 97, - 122, 9, 13, 32, 44, 58, 43, 46, - 48, 57, 65, 90, 97, 122, 9, 13, - 32, 44, 58, 9, 13, 32, 44, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, @@ -1569,49 +633,31 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_keys[] = 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 96, 97, 122, 123, 125, 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 34, 44, 60, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 33, 34, 37, 39, 42, - 44, 47, 58, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 43, 57, 59, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 58, 60, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 59, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, + 60, 126, 42, 46, 48, 57, 65, 90, + 95, 96, 97, 122, 9, 13, 32, 33, 37, 39, 42, 44, 58, 126, 43, 46, 48, 57, 65, 90, 95, 96, 97, 122, 9, 13, 32, 33, 37, 39, 44, 58, 60, 126, 42, 46, 48, 57, 65, 90, 95, 122, 9, 13, 32, 44, 58, 60, - 9, 13, 32, 44, 9, 13, 32, 33, - 34, 37, 39, 44, 60, 126, 42, 46, - 48, 57, 65, 90, 95, 96, 97, 122, - 9, 13, 32, 33, 37, 39, 44, 126, - 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 33, 37, 39, 44, 60, - 126, 42, 46, 48, 57, 65, 90, 95, - 122, 9, 13, 32, 33, 37, 39, 42, - 44, 58, 126, 43, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 33, 37, 39, 44, 58, 60, 126, 42, - 46, 48, 57, 65, 90, 95, 122, 9, - 13, 32, 44, 58, 60, 0 + 9, 13, 32, 44, 9, 13, 32, 34, + 44, 60, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, + 13, 32, 33, 34, 37, 39, 44, 47, + 60, 92, 126, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 35, 41, 42, + 57, 58, 64, 65, 90, 91, 94, 95, + 96, 97, 122, 123, 125, 9, 13, 32, + 33, 34, 37, 39, 42, 44, 47, 58, + 92, 126, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 35, 41, 43, 57, + 59, 64, 65, 90, 91, 94, 95, 96, + 97, 122, 123, 125, 9, 13, 32, 33, + 34, 37, 39, 44, 47, 58, 60, 92, + 126, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 35, 41, 42, 57, 59, + 64, 65, 90, 91, 94, 95, 122, 123, + 125, 0 }; static const char _tsip_machine_parser_header_P_Asserted_Identity_single_lengths[] = { @@ -1625,81 +671,32 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_single_lengths 5, 0, 4, 10, 8, 9, 5, 4, 5, 5, 4, 5, 11, 9, 10, 6, 5, 7, 5, 5, 5, 5, 5, 6, - 13, 10, 2, 3, 10, 2, 3, 4, - 1, 8, 9, 5, 2, 3, 5, 1, - 1, 1, 1, 1, 2, 3, 5, 1, - 11, 10, 6, 1, 12, 13, 5, 1, - 2, 4, 5, 8, 14, 14, 7, 6, + 13, 12, 13, 5, 8, 13, 13, 6, 4, 4, 4, 4, 4, 5, 12, 11, 12, 4, 7, 12, 12, 10, 9, 5, 0, 4, 10, 8, 9, 5, 4, 5, 5, 4, 5, 11, 9, 10, 6, 5, 7, 5, 5, 5, 5, 5, 6, 13, 12, 13, 5, 8, 14, 14, 7, 5, - 11, 9, 10, 6, 5, 4, 10, 8, - 9, 5, 4, 5, 5, 4, 5, 11, - 9, 10, 6, 5, 7, 5, 5, 5, - 5, 5, 6, 13, 11, 7, 5, 5, - 5, 5, 5, 13, 12, 13, 5, 8, - 14, 14, 7, 5, 7, 5, 5, 5, - 5, 6, 6, 5, 13, 12, 13, 5, - 10, 8, 9, 5, 4, 5, 5, 4, - 5, 11, 9, 10, 6, 5, 4, 7, - 5, 5, 5, 5, 5, 6, 13, 10, - 2, 3, 10, 11, 10, 6, 1, 12, - 13, 6, 2, 3, 5, 10, 2, 3, - 10, 11, 10, 6, 1, 5, 11, 9, + 7, 5, 5, 5, 5, 13, 12, 13, + 5, 14, 14, 6, 4, 10, 6, 4, + 4, 4, 4, 4, 12, 11, 12, 4, + 12, 12, 4, 5, 5, 4, 5, 11, + 9, 10, 6, 5, 4, 10, 8, 9, + 5, 6, 4, 4, 4, 4, 4, 5, + 12, 11, 12, 4, 7, 12, 12, 10, + 10, 7, 5, 5, 5, 5, 5, 6, + 13, 12, 13, 5, 8, 13, 13, 6, + 2, 3, 4, 1, 1, 5, 11, 9, 10, 6, 5, 6, 6, 5, 7, 5, 5, 5, 5, 5, 6, 13, 12, 13, - 5, 8, 13, 13, 5, 8, 14, 14, - 7, 6, 4, 4, 4, 4, 4, 5, - 12, 11, 12, 4, 12, 12, 10, 10, - 6, 4, 10, 6, 4, 4, 4, 4, - 4, 12, 11, 12, 4, 12, 12, 5, - 8, 5, 7, 5, 5, 5, 5, 6, - 13, 12, 13, 5, 8, 14, 14, 7, - 5, 7, 5, 5, 5, 5, 6, 6, - 5, 6, 6, 13, 12, 13, 5, 14, - 14, 7, 13, 8, 13, 12, 13, 14, - 14, 14, 14, 7, 13, 8, 13, 12, - 13, 8, 5, 7, 5, 5, 5, 5, - 13, 12, 13, 5, 14, 14, 7, 13, - 14, 14, 11, 11, 7, 5, 11, 7, - 5, 5, 5, 5, 5, 13, 12, 13, - 6, 11, 9, 10, 6, 5, 6, 6, - 5, 7, 5, 5, 5, 5, 5, 6, - 13, 12, 13, 5, 14, 14, 7, 11, - 11, 7, 5, 11, 7, 5, 5, 5, - 5, 5, 13, 11, 7, 5, 5, 5, - 5, 5, 13, 12, 13, 5, 13, 13, - 11, 11, 7, 5, 11, 7, 5, 5, - 5, 5, 5, 13, 12, 13, 5, 13, - 13, 12, 13, 5, 14, 14, 7, 5, - 8, 5, 14, 14, 7, 13, 8, 5, - 7, 5, 5, 5, 5, 13, 11, 7, - 5, 5, 5, 5, 5, 13, 12, 13, - 5, 14, 14, 7, 5, 7, 5, 5, - 5, 5, 13, 12, 13, 5, 14, 14, - 7, 13, 13, 12, 13, 14, 14, 11, - 11, 7, 12, 13, 5, 14, 14, 7, - 13, 11, 11, 7, 5, 11, 12, 13, - 14, 14, 7, 13, 12, 13, 14, 14, - 6, 4, 4, 4, 4, 4, 5, 12, - 11, 12, 4, 7, 13, 13, 6, 4, - 6, 4, 4, 4, 4, 12, 11, 12, - 4, 13, 13, 6, 12, 7, 12, 11, - 12, 13, 13, 10, 10, 6, 4, 10, - 6, 6, 5, 11, 11, 7, 5, 11, - 9, 10, 11, 11, 7, 13, 12, 13, - 8, 14, 14, 11, 11, 7, 5, 11, - 9, 10, 11, 11, 7, 6, 4, 4, - 4, 4, 4, 5, 12, 11, 12, 4, - 7, 13, 13, 6, 4, 6, 4, 4, - 4, 4, 5, 5, 4, 5, 5, 4, - 12, 11, 12, 4, 13, 13, 6, 12, - 12, 11, 12, 7, 13, 13, 10, 10, - 6, 4, 10, 8, 9, 10, 10, 6, - 0 + 5, 8, 13, 13, 7, 13, 11, 11, + 11, 7, 5, 8, 13, 14, 14, 6, + 4, 4, 4, 4, 4, 5, 12, 11, + 12, 4, 7, 13, 13, 6, 4, 6, + 4, 4, 4, 4, 12, 11, 12, 4, + 13, 13, 6, 12, 10, 10, 10, 6, + 4, 7, 12, 13, 13, 0 }; static const char _tsip_machine_parser_header_P_Asserted_Identity_range_lengths[] = { @@ -1713,81 +710,32 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_range_lengths[ 0, 0, 0, 4, 4, 4, 0, 2, 4, 0, 0, 0, 4, 4, 4, 0, 2, 6, 1, 1, 1, 1, 1, 0, - 13, 6, 0, 0, 6, 0, 0, 0, - 2, 5, 5, 0, 0, 0, 6, 1, - 1, 1, 1, 1, 0, 0, 0, 3, - 5, 5, 0, 0, 12, 12, 0, 0, - 0, 0, 2, 6, 13, 12, 6, 6, + 13, 12, 12, 2, 6, 13, 12, 6, 1, 1, 1, 1, 1, 0, 13, 12, 12, 2, 6, 13, 12, 5, 5, 0, 0, 0, 5, 4, 4, 0, 2, 4, 0, 0, 0, 5, 4, 4, 0, 2, 6, 1, 1, 1, 1, 1, 0, 13, - 12, 12, 2, 6, 13, 12, 6, 0, - 5, 4, 4, 0, 2, 0, 5, 4, - 4, 0, 2, 4, 0, 0, 0, 5, - 4, 4, 0, 2, 6, 1, 1, 1, - 1, 1, 0, 13, 5, 6, 1, 1, - 1, 1, 1, 13, 12, 12, 2, 6, - 13, 12, 6, 1, 6, 1, 1, 1, - 1, 0, 0, 2, 13, 12, 12, 0, - 5, 4, 4, 0, 2, 4, 0, 0, - 0, 4, 4, 4, 0, 2, 0, 6, - 1, 1, 1, 1, 1, 0, 13, 6, - 0, 0, 6, 5, 5, 0, 0, 12, - 12, 0, 0, 0, 0, 6, 0, 0, - 6, 5, 5, 0, 0, 0, 4, 4, - 4, 0, 2, 4, 0, 0, 6, 1, - 1, 1, 1, 1, 0, 13, 12, 12, - 2, 6, 13, 12, 2, 6, 13, 12, - 6, 6, 1, 1, 1, 1, 1, 0, - 13, 12, 12, 2, 13, 12, 5, 4, - 0, 0, 4, 6, 1, 1, 1, 1, - 1, 13, 12, 12, 2, 13, 12, 2, - 6, 1, 6, 1, 1, 1, 1, 0, - 13, 12, 12, 2, 6, 13, 12, 6, - 1, 6, 1, 1, 1, 1, 0, 0, - 2, 4, 0, 13, 12, 12, 2, 13, - 12, 6, 13, 6, 13, 12, 12, 13, - 12, 13, 12, 6, 13, 6, 13, 12, - 12, 6, 1, 6, 1, 1, 1, 1, - 13, 12, 12, 2, 13, 12, 6, 13, - 13, 12, 5, 4, 0, 0, 5, 6, - 1, 1, 1, 1, 1, 13, 12, 12, - 0, 5, 4, 4, 0, 2, 4, 0, - 0, 6, 1, 1, 1, 1, 1, 0, - 13, 12, 12, 2, 13, 12, 6, 5, - 4, 0, 0, 4, 6, 1, 1, 1, - 1, 1, 13, 5, 6, 1, 1, 1, - 1, 1, 13, 12, 12, 2, 13, 12, - 5, 4, 0, 0, 4, 6, 1, 1, - 1, 1, 1, 13, 12, 12, 2, 13, - 12, 12, 12, 2, 13, 12, 6, 2, - 6, 2, 13, 12, 6, 13, 6, 1, - 6, 1, 1, 1, 1, 13, 5, 6, - 1, 1, 1, 1, 1, 13, 12, 12, - 2, 13, 12, 6, 1, 6, 1, 1, - 1, 1, 13, 12, 12, 2, 13, 12, - 6, 13, 13, 12, 12, 13, 12, 5, - 4, 0, 12, 12, 2, 13, 12, 6, - 13, 5, 4, 0, 0, 5, 12, 12, - 13, 12, 6, 13, 12, 12, 13, 12, - 6, 1, 1, 1, 1, 1, 0, 13, 12, 12, 2, 6, 13, 12, 6, 1, 6, 1, 1, 1, 1, 13, 12, 12, - 2, 13, 12, 6, 13, 6, 13, 12, - 12, 13, 12, 5, 4, 0, 0, 5, - 4, 0, 0, 5, 4, 0, 0, 5, - 4, 4, 5, 4, 0, 13, 12, 12, - 6, 13, 12, 5, 4, 0, 0, 5, - 4, 4, 5, 4, 0, 6, 1, 1, - 1, 1, 1, 0, 13, 12, 12, 2, - 6, 13, 12, 6, 1, 6, 1, 1, - 1, 1, 0, 0, 2, 4, 0, 0, - 13, 12, 12, 2, 13, 12, 6, 13, - 13, 12, 12, 6, 13, 12, 5, 4, - 0, 0, 5, 4, 4, 5, 4, 0, - 0 + 2, 13, 12, 0, 0, 4, 6, 1, + 1, 1, 1, 1, 13, 12, 12, 2, + 13, 12, 2, 4, 0, 0, 0, 4, + 4, 4, 0, 2, 0, 5, 4, 4, + 0, 6, 1, 1, 1, 1, 1, 0, + 13, 12, 12, 2, 6, 13, 12, 5, + 4, 6, 1, 1, 1, 1, 1, 0, + 13, 12, 12, 2, 6, 13, 12, 0, + 0, 0, 0, 2, 0, 0, 4, 4, + 4, 0, 2, 4, 0, 0, 6, 1, + 1, 1, 1, 1, 0, 13, 12, 12, + 2, 6, 13, 12, 6, 13, 5, 5, + 4, 0, 0, 6, 13, 13, 12, 6, + 1, 1, 1, 1, 1, 0, 13, 12, + 12, 2, 6, 13, 12, 6, 1, 6, + 1, 1, 1, 1, 13, 12, 12, 2, + 13, 12, 6, 13, 5, 5, 4, 0, + 0, 6, 13, 13, 12, 0 }; static const short _tsip_machine_parser_header_P_Asserted_Identity_index_offsets[] = { @@ -1801,81 +749,32 @@ static const short _tsip_machine_parser_header_P_Asserted_Identity_index_offsets 271, 277, 278, 283, 298, 311, 325, 331, 338, 348, 354, 359, 365, 381, 395, 410, 417, 425, 439, 446, 453, 460, 467, 474, - 481, 508, 525, 528, 532, 549, 552, 556, - 561, 565, 579, 594, 600, 603, 607, 619, - 622, 625, 628, 631, 634, 637, 641, 647, - 652, 669, 685, 692, 694, 719, 745, 751, - 753, 756, 761, 769, 784, 812, 839, 853, - 866, 872, 878, 884, 890, 896, 902, 928, - 952, 977, 984, 998, 1024, 1049, 1065, 1080, - 1086, 1087, 1092, 1108, 1121, 1135, 1141, 1148, - 1158, 1164, 1169, 1175, 1192, 1206, 1221, 1228, - 1236, 1250, 1257, 1264, 1271, 1278, 1285, 1292, - 1319, 1344, 1370, 1378, 1393, 1421, 1448, 1462, - 1468, 1485, 1499, 1514, 1521, 1529, 1534, 1550, - 1563, 1577, 1583, 1590, 1600, 1606, 1611, 1617, - 1634, 1648, 1663, 1670, 1678, 1692, 1699, 1706, - 1713, 1720, 1727, 1734, 1761, 1778, 1792, 1799, - 1806, 1813, 1820, 1827, 1854, 1879, 1905, 1913, - 1928, 1956, 1983, 1997, 2004, 2018, 2025, 2032, - 2039, 2046, 2053, 2060, 2068, 2095, 2120, 2146, - 2152, 2168, 2181, 2195, 2201, 2208, 2218, 2224, - 2229, 2235, 2251, 2265, 2280, 2287, 2295, 2300, - 2314, 2321, 2328, 2335, 2342, 2349, 2356, 2383, - 2400, 2403, 2407, 2424, 2441, 2457, 2464, 2466, - 2491, 2517, 2524, 2527, 2531, 2537, 2554, 2557, - 2561, 2578, 2595, 2611, 2618, 2620, 2626, 2642, - 2656, 2671, 2678, 2686, 2697, 2704, 2710, 2724, - 2731, 2738, 2745, 2752, 2759, 2766, 2793, 2818, - 2844, 2852, 2867, 2894, 2920, 2928, 2943, 2971, - 2998, 3012, 3025, 3031, 3037, 3043, 3049, 3055, - 3061, 3087, 3111, 3136, 3143, 3169, 3194, 3210, - 3225, 3232, 3237, 3252, 3265, 3271, 3277, 3283, - 3289, 3295, 3321, 3345, 3370, 3377, 3403, 3428, - 3436, 3451, 3458, 3472, 3479, 3486, 3493, 3500, - 3507, 3534, 3559, 3585, 3593, 3608, 3636, 3663, - 3677, 3684, 3698, 3705, 3712, 3719, 3726, 3733, - 3740, 3748, 3759, 3766, 3793, 3818, 3844, 3852, - 3880, 3907, 3921, 3948, 3963, 3990, 4015, 4041, - 4069, 4096, 4124, 4151, 4165, 4192, 4207, 4234, - 4259, 4285, 4300, 4307, 4321, 4328, 4335, 4342, - 4349, 4376, 4401, 4427, 4435, 4463, 4490, 4504, - 4531, 4559, 4586, 4603, 4619, 4627, 4633, 4650, - 4664, 4671, 4678, 4685, 4692, 4699, 4726, 4751, - 4777, 4784, 4801, 4815, 4830, 4837, 4845, 4856, - 4863, 4869, 4883, 4890, 4897, 4904, 4911, 4918, - 4925, 4952, 4977, 5003, 5011, 5039, 5066, 5080, - 5097, 5113, 5121, 5127, 5143, 5157, 5164, 5171, - 5178, 5185, 5192, 5219, 5236, 5250, 5257, 5264, - 5271, 5278, 5285, 5312, 5337, 5363, 5371, 5398, - 5424, 5441, 5457, 5465, 5471, 5487, 5501, 5508, - 5515, 5522, 5529, 5536, 5563, 5588, 5614, 5622, - 5649, 5675, 5700, 5726, 5734, 5762, 5789, 5803, - 5811, 5826, 5834, 5862, 5889, 5903, 5930, 5945, - 5952, 5966, 5973, 5980, 5987, 5994, 6021, 6038, - 6052, 6059, 6066, 6073, 6080, 6087, 6114, 6139, - 6165, 6173, 6201, 6228, 6242, 6249, 6263, 6270, - 6277, 6284, 6291, 6318, 6343, 6369, 6377, 6405, - 6432, 6446, 6473, 6500, 6525, 6551, 6579, 6606, - 6623, 6639, 6647, 6672, 6698, 6706, 6734, 6761, - 6775, 6802, 6819, 6835, 6843, 6849, 6866, 6891, - 6917, 6945, 6972, 6986, 7013, 7038, 7064, 7092, - 7119, 7132, 7138, 7144, 7150, 7156, 7162, 7168, - 7194, 7218, 7243, 7250, 7264, 7291, 7317, 7330, - 7336, 7349, 7355, 7361, 7367, 7373, 7399, 7423, - 7448, 7455, 7482, 7508, 7521, 7547, 7561, 7587, - 7611, 7636, 7663, 7689, 7705, 7720, 7727, 7732, - 7748, 7759, 7766, 7772, 7789, 7805, 7813, 7819, - 7836, 7850, 7865, 7882, 7898, 7906, 7933, 7958, - 7984, 7999, 8027, 8054, 8071, 8087, 8095, 8101, - 8118, 8132, 8147, 8164, 8180, 8188, 8201, 8207, - 8213, 8219, 8225, 8231, 8237, 8263, 8287, 8312, - 8319, 8333, 8360, 8386, 8399, 8405, 8418, 8424, - 8430, 8436, 8442, 8448, 8454, 8461, 8471, 8477, - 8482, 8508, 8532, 8557, 8564, 8591, 8617, 8630, - 8656, 8682, 8706, 8731, 8745, 8772, 8798, 8814, - 8829, 8836, 8841, 8857, 8870, 8884, 8900, 8915, - 8922 + 481, 508, 533, 559, 567, 582, 609, 635, + 648, 654, 660, 666, 672, 678, 684, 710, + 734, 759, 766, 780, 806, 831, 847, 862, + 868, 869, 874, 890, 903, 917, 923, 930, + 940, 946, 951, 957, 974, 988, 1003, 1010, + 1018, 1032, 1039, 1046, 1053, 1060, 1067, 1074, + 1101, 1126, 1152, 1160, 1175, 1203, 1230, 1244, + 1251, 1265, 1272, 1279, 1286, 1293, 1320, 1345, + 1371, 1379, 1407, 1434, 1441, 1446, 1461, 1474, + 1480, 1486, 1492, 1498, 1504, 1530, 1554, 1579, + 1586, 1612, 1637, 1644, 1654, 1660, 1665, 1671, + 1687, 1701, 1716, 1723, 1731, 1736, 1752, 1765, + 1779, 1785, 1798, 1804, 1810, 1816, 1822, 1828, + 1834, 1860, 1884, 1909, 1916, 1930, 1956, 1981, + 1997, 2012, 2026, 2033, 2040, 2047, 2054, 2061, + 2068, 2095, 2120, 2146, 2154, 2169, 2196, 2222, + 2229, 2232, 2236, 2241, 2245, 2247, 2253, 2269, + 2283, 2298, 2305, 2313, 2324, 2331, 2337, 2351, + 2358, 2365, 2372, 2379, 2386, 2393, 2420, 2445, + 2471, 2479, 2494, 2521, 2547, 2561, 2588, 2605, + 2622, 2638, 2646, 2652, 2667, 2694, 2722, 2749, + 2762, 2768, 2774, 2780, 2786, 2792, 2798, 2824, + 2848, 2873, 2880, 2894, 2921, 2947, 2960, 2966, + 2979, 2985, 2991, 2997, 3003, 3029, 3053, 3078, + 3085, 3112, 3138, 3151, 3177, 3193, 3209, 3224, + 3231, 3236, 3250, 3276, 3303, 3329 }; static const short _tsip_machine_parser_header_P_Asserted_Identity_indicies[] = { @@ -1932,1192 +831,424 @@ static const short _tsip_machine_parser_header_P_Asserted_Identity_indicies[] = 101, 94, 103, 95, 101, 101, 101, 101, 101, 92, 104, 76, 104, 94, 105, 95, 92, 93, 76, 93, 94, 95, 106, 106, - 92, 112, 76, 112, 114, 115, 39, 116, + 92, 112, 76, 112, 114, 115, 95, 116, 107, 108, 109, 110, 111, 113, 92, 93, 76, 93, 94, 95, 113, 92, 93, 76, 93, 94, 95, 107, 92, 93, 76, 93, 94, 95, 108, 92, 93, 76, 93, 94, 95, 109, 92, 93, 76, 93, 94, 95, 110, 92, 102, 76, 102, 94, 103, 95, - 92, 117, 76, 117, 118, 119, 118, 118, - 115, 113, 120, 39, 116, 118, 107, 108, - 109, 110, 111, 113, 118, 113, 121, 113, - 118, 121, 113, 92, 117, 122, 117, 123, - 124, 123, 123, 120, 39, 123, 123, 123, - 123, 125, 123, 125, 38, 126, 39, 38, - 127, 127, 39, 38, 128, 129, 128, 123, - 124, 123, 123, 120, 39, 123, 123, 123, - 123, 125, 123, 125, 38, 130, 39, 38, - 131, 131, 39, 38, 131, 131, 132, 39, - 38, 39, 133, 133, 38, 134, 135, 134, - 136, 136, 136, 39, 136, 136, 136, 136, - 136, 136, 38, 137, 138, 137, 136, 136, - 136, 139, 39, 136, 136, 136, 136, 136, - 136, 38, 140, 141, 140, 132, 39, 38, - 142, 39, 38, 134, 134, 39, 38, 148, - 149, 150, 39, 151, 143, 144, 145, 146, - 147, 148, 38, 39, 148, 38, 39, 143, - 38, 39, 144, 38, 39, 145, 38, 39, - 146, 38, 152, 39, 38, 148, 148, 39, - 38, 137, 138, 137, 139, 39, 38, 39, - 148, 148, 148, 38, 153, 135, 153, 136, - 136, 136, 136, 154, 155, 39, 136, 154, - 154, 154, 136, 154, 38, 156, 138, 156, - 136, 136, 136, 155, 139, 39, 136, 136, - 136, 136, 136, 136, 38, 157, 141, 157, - 155, 132, 39, 38, 95, 92, 158, 76, - 158, 159, 114, 159, 159, 115, 113, 39, - 116, 159, 107, 108, 109, 110, 111, 113, - 159, 113, 159, 113, 159, 113, 92, 160, - 76, 160, 159, 114, 159, 159, 115, 113, - 55, 39, 116, 159, 107, 108, 109, 110, - 111, 113, 159, 113, 159, 113, 159, 113, - 92, 161, 162, 161, 163, 33, 1, 164, - 1, 165, 165, 1, 165, 165, 163, 33, - 1, 112, 76, 112, 115, 95, 113, 113, - 92, 53, 76, 53, 114, 115, 55, 39, - 116, 107, 108, 109, 110, 111, 113, 92, - 166, 76, 166, 159, 114, 159, 159, 159, - 115, 113, 168, 39, 116, 159, 107, 108, - 109, 110, 111, 113, 167, 113, 167, 113, - 159, 167, 113, 92, 72, 76, 72, 159, - 114, 159, 159, 115, 113, 168, 55, 39, - 116, 159, 107, 108, 109, 110, 111, 113, - 159, 113, 159, 113, 159, 113, 92, 112, - 76, 112, 114, 115, 95, 116, 107, 108, - 109, 110, 111, 113, 92, 174, 76, 174, - 176, 177, 178, 169, 170, 171, 172, 173, - 175, 74, 75, 76, 75, 77, 175, 74, - 75, 76, 75, 77, 169, 74, 75, 76, - 75, 77, 170, 74, 75, 76, 75, 77, - 171, 74, 75, 76, 75, 77, 172, 74, - 84, 76, 84, 77, 85, 74, 44, 76, - 44, 179, 180, 179, 179, 177, 175, 25, - 178, 179, 169, 170, 171, 172, 173, 175, - 179, 175, 181, 175, 179, 181, 175, 74, - 182, 76, 182, 183, 176, 183, 183, 177, - 175, 178, 183, 169, 170, 171, 172, 173, - 175, 183, 175, 183, 175, 183, 175, 74, - 160, 76, 160, 183, 176, 183, 183, 177, - 175, 55, 178, 183, 169, 170, 171, 172, - 173, 175, 183, 175, 183, 175, 183, 175, - 74, 174, 76, 174, 177, 175, 175, 74, - 53, 76, 53, 176, 177, 55, 178, 169, - 170, 171, 172, 173, 175, 74, 184, 76, - 184, 183, 176, 183, 183, 183, 177, 175, - 178, 183, 169, 170, 171, 172, 173, 175, - 185, 175, 185, 175, 183, 185, 175, 74, - 72, 76, 72, 183, 176, 183, 183, 177, - 175, 55, 178, 183, 169, 170, 171, 172, - 173, 175, 183, 175, 183, 175, 183, 175, - 74, 186, 51, 186, 52, 52, 52, 52, - 187, 188, 52, 187, 187, 187, 52, 187, - 1, 189, 54, 189, 52, 52, 52, 188, - 55, 52, 52, 52, 52, 52, 52, 1, - 190, 57, 190, 188, 33, 1, 191, 192, - 76, 192, 193, 191, 194, 76, 194, 195, - 196, 195, 195, 193, 197, 195, 195, 195, - 198, 195, 198, 191, 199, 76, 199, 200, - 200, 200, 193, 200, 200, 200, 200, 200, - 191, 201, 76, 201, 200, 200, 200, 193, - 202, 200, 200, 200, 200, 200, 191, 203, - 76, 203, 193, 204, 191, 192, 76, 192, - 193, 205, 205, 191, 206, 76, 206, 193, - 208, 207, 207, 207, 207, 191, 206, 76, - 206, 193, 208, 191, 210, 76, 210, 211, - 209, 210, 76, 210, 211, 212, 209, 213, - 76, 213, 214, 215, 214, 214, 211, 216, - 212, 214, 214, 214, 217, 214, 217, 209, - 218, 76, 218, 219, 219, 219, 211, 212, - 219, 219, 219, 219, 219, 209, 220, 76, - 220, 219, 219, 219, 211, 221, 212, 219, - 219, 219, 219, 219, 209, 222, 76, 222, - 211, 223, 212, 209, 210, 76, 210, 211, - 212, 224, 224, 209, 230, 76, 230, 232, - 233, 39, 234, 225, 226, 227, 228, 229, - 231, 209, 210, 76, 210, 211, 212, 231, - 209, 210, 76, 210, 211, 212, 225, 209, - 210, 76, 210, 211, 212, 226, 209, 210, - 76, 210, 211, 212, 227, 209, 210, 76, - 210, 211, 212, 228, 209, 220, 76, 220, - 211, 221, 212, 209, 213, 76, 213, 235, - 236, 235, 235, 233, 231, 216, 39, 234, - 235, 225, 226, 227, 228, 229, 231, 235, - 231, 237, 231, 235, 237, 231, 209, 238, - 76, 238, 239, 232, 239, 239, 233, 231, - 39, 234, 239, 225, 226, 227, 228, 229, - 231, 239, 231, 239, 231, 239, 231, 209, - 160, 76, 160, 239, 232, 239, 239, 233, - 231, 55, 39, 234, 239, 225, 226, 227, - 228, 229, 231, 239, 231, 239, 231, 239, - 231, 209, 230, 76, 230, 233, 212, 231, - 231, 209, 53, 76, 53, 232, 233, 55, - 39, 234, 225, 226, 227, 228, 229, 231, - 209, 240, 76, 240, 239, 232, 239, 239, - 239, 233, 231, 242, 39, 234, 239, 225, - 226, 227, 228, 229, 231, 241, 231, 241, - 231, 239, 241, 231, 209, 72, 76, 72, - 239, 232, 239, 239, 233, 231, 242, 55, - 39, 234, 239, 225, 226, 227, 228, 229, - 231, 239, 231, 239, 231, 239, 231, 209, - 249, 76, 249, 251, 252, 253, 254, 244, - 245, 246, 247, 248, 250, 243, 255, 76, - 255, 256, 257, 243, 258, 76, 258, 259, - 260, 259, 259, 256, 261, 257, 259, 259, - 259, 262, 259, 262, 243, 263, 76, 263, - 264, 264, 264, 256, 257, 264, 264, 264, - 264, 264, 243, 265, 76, 265, 264, 264, - 264, 256, 266, 257, 264, 264, 264, 264, - 264, 243, 267, 76, 267, 256, 268, 257, - 243, 255, 76, 255, 256, 257, 269, 269, - 243, 271, 76, 271, 272, 270, 273, 76, - 273, 274, 275, 274, 274, 272, 276, 274, - 274, 274, 277, 274, 277, 270, 278, 76, - 278, 279, 279, 279, 272, 279, 279, 279, - 279, 279, 270, 280, 76, 280, 279, 279, - 279, 272, 281, 279, 279, 279, 279, 279, - 270, 282, 76, 282, 272, 283, 270, 271, - 76, 271, 272, 284, 284, 270, 285, 76, - 285, 272, 287, 286, 286, 286, 286, 270, - 285, 76, 285, 272, 287, 270, 289, 76, - 289, 290, 288, 289, 76, 289, 290, 257, - 288, 291, 76, 291, 292, 293, 292, 292, - 290, 294, 257, 292, 292, 292, 295, 292, - 295, 288, 296, 76, 296, 297, 297, 297, - 290, 257, 297, 297, 297, 297, 297, 288, - 298, 76, 298, 297, 297, 297, 290, 299, - 257, 297, 297, 297, 297, 297, 288, 300, - 76, 300, 290, 301, 257, 288, 289, 76, - 289, 290, 257, 302, 302, 288, 308, 76, - 308, 310, 311, 39, 312, 303, 304, 305, - 306, 307, 309, 288, 289, 76, 289, 290, - 257, 309, 288, 289, 76, 289, 290, 257, - 303, 288, 289, 76, 289, 290, 257, 304, - 288, 289, 76, 289, 290, 257, 305, 288, - 289, 76, 289, 290, 257, 306, 288, 298, - 76, 298, 290, 299, 257, 288, 313, 76, - 313, 314, 315, 314, 314, 311, 309, 216, - 39, 312, 314, 303, 304, 305, 306, 307, - 309, 314, 309, 316, 309, 314, 316, 309, - 288, 313, 76, 313, 214, 317, 214, 214, - 211, 216, 212, 214, 214, 214, 318, 214, - 318, 209, 324, 76, 324, 232, 326, 39, - 327, 319, 320, 321, 322, 323, 325, 209, - 210, 76, 210, 211, 212, 325, 209, 210, - 76, 210, 211, 212, 319, 209, 210, 76, - 210, 211, 212, 320, 209, 210, 76, 210, - 211, 212, 321, 209, 210, 76, 210, 211, - 212, 322, 209, 213, 76, 213, 328, 329, - 328, 328, 326, 325, 216, 39, 327, 328, - 319, 320, 321, 322, 323, 325, 328, 325, - 330, 325, 328, 330, 325, 209, 331, 76, - 331, 332, 232, 332, 332, 326, 325, 39, - 327, 332, 319, 320, 321, 322, 323, 325, - 332, 325, 332, 325, 332, 325, 209, 160, - 76, 160, 332, 232, 332, 332, 326, 325, - 55, 39, 327, 332, 319, 320, 321, 322, - 323, 325, 332, 325, 332, 325, 332, 325, - 209, 324, 76, 324, 326, 212, 325, 325, - 209, 137, 76, 137, 232, 233, 139, 39, - 234, 225, 226, 227, 228, 229, 231, 209, - 333, 76, 333, 332, 232, 332, 332, 332, - 326, 325, 335, 39, 327, 332, 319, 320, - 321, 322, 323, 325, 334, 325, 334, 325, - 332, 334, 325, 209, 72, 76, 72, 332, - 232, 332, 332, 326, 325, 335, 55, 39, - 327, 332, 319, 320, 321, 322, 323, 325, - 332, 325, 332, 325, 332, 325, 209, 341, - 76, 341, 251, 343, 253, 344, 336, 337, - 338, 339, 340, 342, 243, 255, 76, 255, - 256, 257, 342, 243, 341, 76, 341, 251, - 345, 39, 344, 336, 337, 338, 339, 340, - 342, 243, 255, 76, 255, 256, 257, 336, - 243, 255, 76, 255, 256, 257, 337, 243, - 255, 76, 255, 256, 257, 338, 243, 255, - 76, 255, 256, 257, 339, 243, 346, 76, - 346, 256, 347, 257, 243, 348, 76, 348, - 256, 349, 257, 243, 255, 76, 255, 256, - 257, 350, 350, 243, 258, 76, 258, 351, - 352, 351, 351, 345, 342, 261, 39, 344, - 351, 336, 337, 338, 339, 340, 342, 351, - 342, 353, 342, 351, 353, 342, 243, 354, - 76, 354, 355, 251, 355, 355, 345, 342, - 253, 344, 355, 336, 337, 338, 339, 340, - 342, 355, 342, 355, 342, 355, 342, 243, - 356, 76, 356, 355, 251, 355, 355, 345, - 342, 357, 253, 344, 355, 336, 337, 338, - 339, 340, 342, 355, 342, 355, 342, 355, - 342, 243, 358, 76, 358, 359, 360, 74, - 361, 76, 361, 362, 363, 362, 362, 77, - 364, 362, 362, 362, 365, 362, 365, 74, - 366, 76, 366, 367, 367, 367, 77, 367, - 367, 367, 367, 367, 74, 368, 76, 368, - 367, 367, 367, 77, 357, 367, 367, 367, - 367, 367, 74, 369, 76, 369, 77, 360, - 74, 75, 76, 75, 77, 370, 370, 74, - 371, 76, 371, 77, 373, 372, 372, 372, - 372, 74, 371, 76, 371, 77, 373, 74, - 375, 76, 375, 376, 374, 375, 76, 375, - 376, 253, 374, 377, 76, 377, 378, 379, - 378, 378, 376, 380, 253, 378, 378, 378, - 378, 378, 374, 381, 76, 381, 382, 382, - 382, 376, 253, 382, 382, 382, 382, 382, - 374, 383, 76, 383, 382, 382, 382, 376, - 384, 253, 382, 382, 382, 382, 382, 374, - 385, 76, 385, 376, 386, 253, 374, 375, - 76, 375, 376, 253, 387, 387, 374, 388, - 76, 388, 359, 74, 394, 76, 394, 396, - 397, 39, 398, 389, 390, 391, 392, 393, - 395, 374, 375, 76, 375, 376, 253, 395, - 374, 375, 76, 375, 376, 253, 389, 374, - 375, 76, 375, 376, 253, 390, 374, 375, - 76, 375, 376, 253, 391, 374, 375, 76, - 375, 376, 253, 392, 374, 383, 76, 383, - 376, 384, 253, 374, 399, 76, 399, 400, - 401, 400, 400, 397, 395, 120, 39, 398, - 400, 389, 390, 391, 392, 393, 395, 400, - 395, 402, 395, 400, 402, 395, 374, 399, - 403, 399, 123, 124, 123, 123, 120, 39, - 123, 123, 123, 123, 404, 123, 404, 38, - 405, 39, 38, 406, 406, 39, 38, 407, - 129, 407, 123, 124, 123, 123, 120, 39, - 123, 123, 123, 123, 404, 123, 404, 38, - 408, 135, 408, 136, 136, 136, 136, 409, - 410, 39, 136, 409, 409, 409, 136, 409, - 38, 411, 138, 411, 136, 136, 136, 410, - 139, 39, 136, 136, 136, 136, 136, 136, - 38, 412, 141, 412, 410, 132, 39, 38, - 253, 374, 413, 76, 413, 414, 396, 414, - 414, 397, 395, 39, 398, 414, 389, 390, - 391, 392, 393, 395, 414, 395, 414, 395, - 414, 395, 374, 415, 76, 415, 414, 396, - 414, 414, 397, 395, 139, 39, 398, 414, - 389, 390, 391, 392, 393, 395, 414, 395, - 414, 395, 414, 395, 374, 416, 417, 416, - 418, 132, 39, 38, 419, 39, 38, 420, - 420, 39, 38, 420, 420, 418, 132, 39, - 38, 421, 422, 421, 123, 124, 123, 123, - 120, 39, 123, 123, 123, 123, 423, 123, - 423, 38, 424, 39, 38, 425, 425, 39, - 38, 426, 129, 426, 123, 124, 123, 123, - 120, 39, 123, 123, 123, 123, 423, 123, - 423, 38, 427, 135, 427, 136, 136, 136, - 136, 428, 429, 39, 136, 428, 428, 428, - 136, 428, 38, 430, 138, 430, 136, 136, - 136, 429, 139, 39, 136, 136, 136, 136, - 136, 136, 38, 431, 141, 431, 429, 132, - 39, 38, 253, 432, 433, 76, 433, 434, - 253, 432, 435, 76, 435, 436, 437, 436, - 436, 434, 438, 253, 436, 436, 436, 436, - 436, 432, 439, 76, 439, 440, 440, 440, - 434, 253, 440, 440, 440, 440, 440, 432, - 441, 76, 441, 440, 440, 440, 434, 442, - 253, 440, 440, 440, 440, 440, 432, 443, - 76, 443, 434, 444, 253, 432, 433, 76, - 433, 434, 253, 445, 445, 432, 446, 76, - 446, 434, 448, 253, 447, 447, 447, 447, - 432, 446, 76, 446, 434, 448, 253, 432, - 375, 76, 375, 376, 39, 374, 454, 76, - 454, 456, 457, 39, 458, 449, 450, 451, - 452, 453, 455, 432, 433, 76, 433, 434, - 253, 455, 432, 433, 76, 433, 434, 253, - 449, 432, 433, 76, 433, 434, 253, 450, - 432, 433, 76, 433, 434, 253, 451, 432, - 433, 76, 433, 434, 253, 452, 432, 441, - 76, 441, 434, 442, 253, 432, 421, 76, - 421, 459, 460, 459, 459, 457, 455, 120, - 39, 458, 459, 449, 450, 451, 452, 453, - 455, 459, 455, 461, 455, 459, 461, 455, - 432, 462, 76, 462, 463, 456, 463, 463, - 457, 455, 39, 458, 463, 449, 450, 451, - 452, 453, 455, 463, 455, 463, 455, 463, - 455, 432, 415, 76, 415, 463, 456, 463, - 463, 457, 455, 139, 39, 458, 463, 449, - 450, 451, 452, 453, 455, 463, 455, 463, - 455, 463, 455, 432, 454, 76, 454, 457, - 39, 455, 455, 432, 137, 76, 137, 456, - 457, 139, 39, 458, 449, 450, 451, 452, - 453, 455, 432, 464, 76, 464, 463, 456, - 463, 463, 463, 457, 455, 39, 458, 463, - 449, 450, 451, 452, 453, 455, 465, 455, - 465, 455, 463, 465, 455, 432, 430, 76, - 430, 463, 456, 463, 463, 457, 455, 139, - 39, 458, 463, 449, 450, 451, 452, 453, - 455, 463, 455, 463, 455, 463, 455, 432, - 394, 76, 394, 397, 253, 395, 395, 374, - 137, 76, 137, 396, 397, 139, 39, 398, - 389, 390, 391, 392, 393, 395, 374, 466, - 76, 466, 414, 396, 414, 414, 414, 397, - 395, 468, 39, 398, 414, 389, 390, 391, - 392, 393, 395, 467, 395, 467, 395, 414, - 467, 395, 374, 430, 76, 430, 414, 396, - 414, 414, 397, 395, 468, 139, 39, 398, - 414, 389, 390, 391, 392, 393, 395, 414, - 395, 414, 395, 414, 395, 374, 394, 76, - 394, 396, 397, 253, 398, 389, 390, 391, - 392, 393, 395, 374, 474, 76, 474, 476, - 477, 478, 469, 470, 471, 472, 473, 475, - 74, 75, 76, 75, 77, 475, 74, 75, - 76, 75, 77, 469, 74, 75, 76, 75, - 77, 470, 74, 75, 76, 75, 77, 471, - 74, 75, 76, 75, 77, 472, 74, 368, - 76, 368, 77, 357, 74, 44, 76, 44, - 479, 180, 479, 479, 477, 475, 25, 478, - 479, 469, 470, 471, 472, 473, 475, 479, - 475, 480, 475, 479, 480, 475, 74, 481, - 76, 481, 482, 476, 482, 482, 477, 475, - 478, 482, 469, 470, 471, 472, 473, 475, - 482, 475, 482, 475, 482, 475, 74, 160, - 76, 160, 482, 476, 482, 482, 477, 475, - 55, 478, 482, 469, 470, 471, 472, 473, - 475, 482, 475, 482, 475, 482, 475, 74, - 474, 76, 474, 477, 475, 475, 74, 483, - 76, 483, 482, 476, 482, 482, 482, 477, - 475, 478, 482, 469, 470, 471, 472, 473, - 475, 484, 475, 484, 475, 482, 484, 475, - 74, 72, 76, 72, 482, 476, 482, 482, - 477, 475, 55, 478, 482, 469, 470, 471, - 472, 473, 475, 482, 475, 482, 475, 482, - 475, 74, 485, 76, 485, 367, 367, 367, - 367, 77, 487, 367, 486, 486, 486, 367, - 486, 74, 488, 76, 488, 367, 367, 367, - 77, 487, 357, 367, 367, 367, 367, 367, - 74, 489, 76, 489, 77, 487, 360, 74, - 75, 76, 75, 490, 74, 491, 76, 491, - 79, 492, 79, 79, 77, 81, 79, 79, - 79, 79, 79, 74, 498, 76, 498, 176, - 500, 501, 493, 494, 495, 496, 497, 499, - 74, 75, 76, 75, 77, 499, 74, 75, - 76, 75, 77, 493, 74, 75, 76, 75, - 77, 494, 74, 75, 76, 75, 77, 495, - 74, 75, 76, 75, 77, 496, 74, 361, - 76, 361, 502, 180, 502, 502, 500, 499, - 364, 501, 502, 493, 494, 495, 496, 497, - 499, 502, 499, 503, 499, 502, 503, 499, - 74, 504, 76, 504, 505, 176, 505, 505, - 500, 499, 501, 505, 493, 494, 495, 496, - 497, 499, 505, 499, 505, 499, 505, 499, - 74, 356, 76, 356, 505, 176, 505, 505, - 500, 499, 357, 501, 505, 493, 494, 495, - 496, 497, 499, 505, 499, 505, 499, 505, - 499, 74, 498, 76, 498, 500, 499, 499, - 74, 506, 76, 506, 505, 176, 505, 505, - 505, 500, 499, 501, 505, 493, 494, 495, - 496, 497, 499, 507, 499, 507, 499, 505, - 507, 499, 74, 488, 76, 488, 505, 176, - 505, 505, 500, 499, 357, 501, 505, 493, - 494, 495, 496, 497, 499, 505, 499, 505, - 499, 505, 499, 74, 341, 76, 341, 345, - 257, 342, 342, 243, 137, 76, 137, 514, - 515, 139, 39, 516, 508, 509, 510, 511, - 512, 513, 243, 255, 76, 255, 256, 257, - 513, 243, 517, 76, 517, 514, 515, 39, - 516, 508, 509, 510, 511, 512, 513, 243, - 255, 76, 255, 256, 257, 508, 243, 255, - 76, 255, 256, 257, 509, 243, 255, 76, - 255, 256, 257, 510, 243, 255, 76, 255, - 256, 257, 511, 243, 265, 76, 265, 256, - 266, 257, 243, 213, 76, 213, 518, 519, - 518, 518, 515, 513, 216, 39, 516, 518, - 508, 509, 510, 511, 512, 513, 518, 513, - 520, 513, 518, 520, 513, 243, 521, 76, - 521, 522, 514, 522, 522, 515, 513, 39, - 516, 522, 508, 509, 510, 511, 512, 513, - 522, 513, 522, 513, 522, 513, 243, 160, - 76, 160, 522, 514, 522, 522, 515, 513, - 55, 39, 516, 522, 508, 509, 510, 511, - 512, 513, 522, 513, 522, 513, 522, 513, - 243, 517, 76, 517, 515, 212, 513, 513, - 243, 53, 76, 53, 514, 515, 55, 39, - 516, 508, 509, 510, 511, 512, 513, 243, - 523, 76, 523, 522, 514, 522, 522, 522, - 515, 513, 525, 39, 516, 522, 508, 509, - 510, 511, 512, 513, 524, 513, 524, 513, - 522, 524, 513, 243, 72, 76, 72, 522, - 514, 522, 522, 515, 513, 525, 55, 39, - 516, 522, 508, 509, 510, 511, 512, 513, - 522, 513, 522, 513, 522, 513, 243, 531, - 76, 531, 533, 534, 253, 535, 526, 527, - 528, 529, 530, 532, 243, 255, 76, 255, - 256, 257, 532, 243, 531, 76, 531, 533, - 536, 39, 535, 526, 527, 528, 529, 530, - 532, 243, 255, 76, 255, 256, 257, 526, - 243, 255, 76, 255, 256, 257, 527, 243, - 255, 76, 255, 256, 257, 528, 243, 255, - 76, 255, 256, 257, 529, 243, 537, 76, - 537, 256, 538, 257, 243, 539, 76, 539, - 256, 540, 257, 243, 255, 76, 255, 256, - 257, 541, 541, 243, 542, 76, 542, 256, - 288, 257, 543, 543, 543, 543, 243, 542, - 76, 542, 256, 288, 257, 243, 258, 76, - 258, 544, 519, 544, 544, 536, 532, 261, - 39, 535, 544, 526, 527, 528, 529, 530, - 532, 544, 532, 545, 532, 544, 545, 532, - 243, 546, 76, 546, 547, 533, 547, 547, - 536, 532, 253, 535, 547, 526, 527, 528, - 529, 530, 532, 547, 532, 547, 532, 547, - 532, 243, 356, 76, 356, 547, 533, 547, - 547, 536, 532, 357, 253, 535, 547, 526, - 527, 528, 529, 530, 532, 547, 532, 547, - 532, 547, 532, 243, 531, 76, 531, 536, - 257, 532, 532, 243, 548, 76, 548, 547, - 533, 547, 547, 547, 536, 532, 550, 253, - 535, 547, 526, 527, 528, 529, 530, 532, - 549, 532, 549, 532, 547, 549, 532, 243, - 488, 76, 488, 547, 533, 547, 547, 536, - 532, 550, 357, 253, 535, 547, 526, 527, - 528, 529, 530, 532, 547, 532, 547, 532, - 547, 532, 243, 531, 76, 531, 533, 551, - 253, 535, 526, 527, 528, 529, 530, 532, - 243, 258, 76, 258, 544, 552, 544, 544, - 536, 532, 261, 39, 535, 544, 526, 527, - 528, 529, 530, 532, 544, 532, 545, 532, - 544, 545, 532, 243, 53, 76, 53, 533, - 536, 55, 39, 535, 526, 527, 528, 529, - 530, 532, 243, 213, 76, 213, 553, 552, - 553, 553, 536, 532, 216, 39, 535, 553, - 526, 527, 528, 529, 530, 532, 553, 532, - 554, 532, 553, 554, 532, 243, 555, 76, - 555, 556, 533, 556, 556, 536, 532, 39, - 535, 556, 526, 527, 528, 529, 530, 532, - 556, 532, 556, 532, 556, 532, 243, 160, - 76, 160, 556, 533, 556, 556, 536, 532, - 55, 39, 535, 556, 526, 527, 528, 529, - 530, 532, 556, 532, 556, 532, 556, 532, - 243, 557, 76, 557, 556, 533, 556, 556, - 556, 536, 532, 550, 39, 535, 556, 526, - 527, 528, 529, 530, 532, 558, 532, 558, - 532, 556, 558, 532, 243, 72, 76, 72, - 556, 533, 556, 556, 536, 532, 550, 55, - 39, 535, 556, 526, 527, 528, 529, 530, - 532, 556, 532, 556, 532, 556, 532, 243, - 559, 76, 559, 355, 251, 355, 355, 355, - 345, 342, 561, 253, 344, 355, 336, 337, - 338, 339, 340, 342, 560, 342, 560, 342, - 355, 560, 342, 243, 488, 76, 488, 355, - 251, 355, 355, 345, 342, 561, 357, 253, - 344, 355, 336, 337, 338, 339, 340, 342, - 355, 342, 355, 342, 355, 342, 243, 341, - 76, 341, 251, 562, 253, 344, 336, 337, - 338, 339, 340, 342, 243, 258, 76, 258, - 351, 563, 351, 351, 345, 342, 261, 39, - 344, 351, 336, 337, 338, 339, 340, 342, - 351, 342, 353, 342, 351, 353, 342, 243, - 137, 76, 137, 533, 536, 139, 39, 535, - 526, 527, 528, 529, 530, 532, 243, 213, - 76, 213, 564, 565, 564, 564, 345, 342, - 216, 39, 344, 564, 336, 337, 338, 339, - 340, 342, 564, 342, 566, 342, 564, 566, - 342, 243, 567, 76, 567, 568, 251, 568, - 568, 345, 342, 39, 344, 568, 336, 337, - 338, 339, 340, 342, 568, 342, 568, 342, - 568, 342, 243, 160, 76, 160, 568, 251, - 568, 568, 345, 342, 55, 39, 344, 568, - 336, 337, 338, 339, 340, 342, 568, 342, - 568, 342, 568, 342, 243, 137, 76, 137, - 251, 569, 139, 39, 254, 244, 245, 246, - 247, 248, 250, 243, 255, 76, 255, 256, - 257, 250, 243, 249, 76, 249, 251, 569, - 39, 254, 244, 245, 246, 247, 248, 250, - 243, 255, 76, 255, 256, 257, 244, 243, - 255, 76, 255, 256, 257, 245, 243, 255, - 76, 255, 256, 257, 246, 243, 255, 76, - 255, 256, 257, 247, 243, 258, 76, 258, - 570, 519, 570, 570, 569, 250, 261, 39, - 254, 570, 244, 245, 246, 247, 248, 250, - 570, 250, 571, 250, 570, 571, 250, 243, - 572, 76, 572, 573, 251, 573, 573, 569, - 250, 253, 254, 573, 244, 245, 246, 247, - 248, 250, 573, 250, 573, 250, 573, 250, - 243, 356, 76, 356, 573, 251, 573, 573, - 569, 250, 357, 253, 254, 573, 244, 245, - 246, 247, 248, 250, 573, 250, 573, 250, - 573, 250, 243, 249, 76, 249, 569, 257, - 250, 250, 243, 574, 76, 574, 573, 251, - 573, 573, 573, 569, 250, 576, 253, 254, - 573, 244, 245, 246, 247, 248, 250, 575, - 250, 575, 250, 573, 575, 250, 243, 488, - 76, 488, 573, 251, 573, 573, 569, 250, - 576, 357, 253, 254, 573, 244, 245, 246, - 247, 248, 250, 573, 250, 573, 250, 573, - 250, 243, 249, 76, 249, 251, 577, 253, - 254, 244, 245, 246, 247, 248, 250, 243, - 258, 76, 258, 570, 552, 570, 570, 569, - 250, 261, 39, 254, 570, 244, 245, 246, - 247, 248, 250, 570, 250, 571, 250, 570, - 571, 250, 243, 578, 76, 578, 568, 251, - 568, 568, 568, 345, 342, 561, 39, 344, - 568, 336, 337, 338, 339, 340, 342, 579, - 342, 579, 342, 568, 579, 342, 243, 72, - 76, 72, 568, 251, 568, 568, 345, 342, - 561, 55, 39, 344, 568, 336, 337, 338, - 339, 340, 342, 568, 342, 568, 342, 568, - 342, 243, 580, 76, 580, 219, 219, 219, - 219, 211, 582, 212, 219, 581, 581, 581, - 219, 581, 209, 583, 76, 583, 219, 219, - 219, 211, 582, 221, 212, 219, 219, 219, - 219, 219, 209, 584, 76, 584, 211, 582, - 223, 212, 209, 289, 76, 289, 585, 257, - 288, 586, 76, 586, 292, 587, 292, 292, - 290, 294, 257, 292, 292, 292, 295, 292, - 295, 288, 593, 76, 593, 310, 595, 253, - 596, 588, 589, 590, 591, 592, 594, 288, - 289, 76, 289, 290, 257, 594, 288, 289, - 76, 289, 290, 257, 588, 288, 289, 76, - 289, 290, 257, 589, 288, 289, 76, 289, - 290, 257, 590, 288, 289, 76, 289, 290, - 257, 591, 288, 291, 76, 291, 597, 315, - 597, 597, 595, 594, 294, 253, 596, 597, - 588, 589, 590, 591, 592, 594, 597, 594, - 598, 594, 597, 598, 594, 288, 599, 76, - 599, 600, 310, 600, 600, 595, 594, 253, - 596, 600, 588, 589, 590, 591, 592, 594, - 600, 594, 600, 594, 600, 594, 288, 601, - 76, 601, 600, 310, 600, 600, 595, 594, - 602, 253, 596, 600, 588, 589, 590, 591, - 592, 594, 600, 594, 600, 594, 600, 594, - 288, 603, 76, 603, 604, 605, 95, 92, - 606, 76, 606, 607, 608, 607, 607, 94, - 609, 95, 607, 607, 607, 610, 607, 610, - 92, 611, 76, 611, 612, 612, 612, 94, - 95, 612, 612, 612, 612, 612, 92, 613, - 76, 613, 612, 612, 612, 94, 602, 95, - 612, 612, 612, 612, 612, 92, 614, 76, - 614, 94, 605, 95, 92, 93, 76, 93, - 94, 95, 615, 615, 92, 616, 76, 616, - 94, 618, 95, 617, 617, 617, 617, 92, - 616, 76, 616, 94, 618, 95, 92, 375, - 76, 375, 376, 95, 374, 624, 76, 624, - 626, 627, 39, 628, 619, 620, 621, 622, - 623, 625, 92, 93, 76, 93, 94, 95, - 625, 92, 93, 76, 93, 94, 95, 619, - 92, 93, 76, 93, 94, 95, 620, 92, - 93, 76, 93, 94, 95, 621, 92, 93, - 76, 93, 94, 95, 622, 92, 613, 76, - 613, 94, 602, 95, 92, 117, 76, 117, - 629, 119, 629, 629, 627, 625, 120, 39, - 628, 629, 619, 620, 621, 622, 623, 625, - 629, 625, 630, 625, 629, 630, 625, 92, - 631, 76, 631, 632, 626, 632, 632, 627, - 625, 39, 628, 632, 619, 620, 621, 622, - 623, 625, 632, 625, 632, 625, 632, 625, - 92, 160, 76, 160, 632, 626, 632, 632, - 627, 625, 55, 39, 628, 632, 619, 620, - 621, 622, 623, 625, 632, 625, 632, 625, - 632, 625, 92, 624, 76, 624, 627, 95, - 625, 625, 92, 633, 76, 633, 632, 626, - 632, 632, 632, 627, 625, 635, 39, 628, - 632, 619, 620, 621, 622, 623, 625, 634, - 625, 634, 625, 632, 634, 625, 92, 72, - 76, 72, 632, 626, 632, 632, 627, 625, - 635, 55, 39, 628, 632, 619, 620, 621, - 622, 623, 625, 632, 625, 632, 625, 632, - 625, 92, 624, 76, 624, 626, 627, 95, - 628, 619, 620, 621, 622, 623, 625, 92, - 636, 76, 636, 612, 612, 612, 612, 94, - 638, 95, 612, 637, 637, 637, 612, 637, - 92, 639, 76, 639, 612, 612, 612, 94, - 638, 602, 95, 612, 612, 612, 612, 612, - 92, 640, 76, 640, 94, 638, 605, 95, - 92, 93, 76, 93, 641, 95, 92, 642, - 76, 642, 97, 643, 97, 97, 94, 99, - 95, 97, 97, 97, 97, 97, 92, 649, - 76, 649, 114, 651, 39, 652, 644, 645, - 646, 647, 648, 650, 92, 93, 76, 93, - 94, 95, 650, 92, 93, 76, 93, 94, - 95, 644, 92, 93, 76, 93, 94, 95, - 645, 92, 93, 76, 93, 94, 95, 646, - 92, 93, 76, 93, 94, 95, 647, 92, - 653, 76, 653, 654, 119, 654, 654, 651, - 650, 438, 39, 652, 654, 644, 645, 646, - 647, 648, 650, 654, 650, 655, 650, 654, - 655, 650, 92, 653, 76, 653, 436, 656, - 436, 436, 434, 438, 253, 436, 436, 436, - 657, 436, 657, 432, 663, 76, 663, 456, - 665, 39, 666, 658, 659, 660, 661, 662, - 664, 432, 433, 76, 433, 434, 253, 664, - 432, 433, 76, 433, 434, 253, 658, 432, - 433, 76, 433, 434, 253, 659, 432, 433, - 76, 433, 434, 253, 660, 432, 433, 76, - 433, 434, 253, 661, 432, 44, 76, 44, - 667, 460, 667, 667, 665, 664, 25, 39, - 666, 667, 658, 659, 660, 661, 662, 664, - 667, 664, 668, 664, 667, 668, 664, 432, - 669, 76, 669, 670, 456, 670, 670, 665, - 664, 39, 666, 670, 658, 659, 660, 661, - 662, 664, 670, 664, 670, 664, 670, 664, - 432, 160, 76, 160, 670, 456, 670, 670, - 665, 664, 55, 39, 666, 670, 658, 659, - 660, 661, 662, 664, 670, 664, 670, 664, - 670, 664, 432, 663, 76, 663, 665, 39, - 664, 664, 432, 671, 76, 671, 670, 456, - 670, 670, 670, 665, 664, 39, 666, 670, - 658, 659, 660, 661, 662, 664, 672, 664, - 672, 664, 670, 672, 664, 432, 72, 76, - 72, 670, 456, 670, 670, 665, 664, 55, - 39, 666, 670, 658, 659, 660, 661, 662, - 664, 670, 664, 670, 664, 670, 664, 432, - 673, 76, 673, 440, 440, 440, 440, 434, - 675, 253, 440, 674, 674, 674, 440, 674, - 432, 676, 76, 676, 440, 440, 440, 434, - 675, 442, 253, 440, 440, 440, 440, 440, - 432, 677, 76, 677, 434, 675, 444, 253, - 432, 93, 76, 93, 678, 95, 92, 679, - 76, 679, 97, 680, 97, 97, 94, 99, - 95, 97, 97, 97, 97, 97, 92, 686, - 76, 686, 114, 688, 95, 689, 681, 682, - 683, 684, 685, 687, 92, 93, 76, 93, - 94, 95, 687, 92, 93, 76, 93, 94, - 95, 681, 92, 93, 76, 93, 94, 95, - 682, 92, 93, 76, 93, 94, 95, 683, - 92, 93, 76, 93, 94, 95, 684, 92, - 606, 76, 606, 690, 119, 690, 690, 688, - 687, 609, 95, 689, 690, 681, 682, 683, - 684, 685, 687, 690, 687, 691, 687, 690, - 691, 687, 92, 692, 76, 692, 693, 114, - 693, 693, 688, 687, 95, 689, 693, 681, - 682, 683, 684, 685, 687, 693, 687, 693, - 687, 693, 687, 92, 601, 76, 601, 693, - 114, 693, 693, 688, 687, 602, 95, 689, - 693, 681, 682, 683, 684, 685, 687, 693, - 687, 693, 687, 693, 687, 92, 686, 76, - 686, 688, 95, 687, 687, 92, 694, 76, - 694, 693, 114, 693, 693, 693, 688, 687, - 95, 689, 693, 681, 682, 683, 684, 685, - 687, 695, 687, 695, 687, 693, 695, 687, - 92, 639, 76, 639, 693, 114, 693, 693, - 688, 687, 602, 95, 689, 693, 681, 682, - 683, 684, 685, 687, 693, 687, 693, 687, - 693, 687, 92, 696, 76, 696, 697, 114, - 697, 697, 651, 650, 39, 652, 697, 644, - 645, 646, 647, 648, 650, 697, 650, 697, - 650, 697, 650, 92, 356, 76, 356, 697, - 114, 697, 697, 651, 650, 357, 39, 652, - 697, 644, 645, 646, 647, 648, 650, 697, - 650, 697, 650, 697, 650, 92, 649, 76, - 649, 651, 95, 650, 650, 92, 698, 76, - 698, 697, 114, 697, 697, 697, 651, 650, - 700, 39, 652, 697, 644, 645, 646, 647, - 648, 650, 699, 650, 699, 650, 697, 699, - 650, 92, 488, 76, 488, 697, 114, 697, - 697, 651, 650, 700, 357, 39, 652, 697, - 644, 645, 646, 647, 648, 650, 697, 650, - 697, 650, 697, 650, 92, 649, 76, 649, - 114, 651, 95, 652, 644, 645, 646, 647, - 648, 650, 92, 593, 76, 593, 595, 257, - 594, 594, 288, 53, 76, 53, 310, 311, - 55, 39, 312, 303, 304, 305, 306, 307, - 309, 288, 308, 76, 308, 311, 257, 309, - 309, 288, 701, 76, 701, 600, 310, 600, - 600, 600, 595, 594, 703, 253, 596, 600, - 588, 589, 590, 591, 592, 594, 702, 594, - 702, 594, 600, 702, 594, 288, 639, 76, - 639, 600, 310, 600, 600, 595, 594, 703, - 602, 253, 596, 600, 588, 589, 590, 591, - 592, 594, 600, 594, 600, 594, 600, 594, - 288, 593, 76, 593, 310, 704, 253, 596, - 588, 589, 590, 591, 592, 594, 288, 291, - 76, 291, 597, 705, 597, 597, 595, 594, - 294, 253, 596, 597, 588, 589, 590, 591, - 592, 594, 597, 594, 598, 594, 597, 598, - 594, 288, 53, 76, 53, 310, 712, 55, - 39, 713, 706, 707, 708, 709, 710, 711, - 288, 289, 76, 289, 290, 257, 711, 288, - 714, 76, 714, 310, 712, 39, 713, 706, - 707, 708, 709, 710, 711, 288, 289, 76, - 289, 290, 257, 706, 288, 289, 76, 289, - 290, 257, 707, 288, 289, 76, 289, 290, - 257, 708, 288, 289, 76, 289, 290, 257, - 709, 288, 715, 76, 715, 716, 315, 716, - 716, 712, 711, 261, 39, 713, 716, 706, - 707, 708, 709, 710, 711, 716, 711, 717, - 711, 716, 717, 711, 288, 715, 76, 715, - 259, 718, 259, 259, 256, 261, 257, 259, - 259, 259, 719, 259, 719, 243, 725, 76, - 725, 514, 727, 39, 728, 720, 721, 722, - 723, 724, 726, 243, 255, 76, 255, 256, - 257, 726, 243, 255, 76, 255, 256, 257, - 720, 243, 255, 76, 255, 256, 257, 721, - 243, 255, 76, 255, 256, 257, 722, 243, - 255, 76, 255, 256, 257, 723, 243, 213, - 76, 213, 729, 352, 729, 729, 727, 726, - 216, 39, 728, 729, 720, 721, 722, 723, - 724, 726, 729, 726, 730, 726, 729, 730, - 726, 243, 731, 76, 731, 732, 514, 732, - 732, 727, 726, 39, 728, 732, 720, 721, - 722, 723, 724, 726, 732, 726, 732, 726, - 732, 726, 243, 160, 76, 160, 732, 514, - 732, 732, 727, 726, 55, 39, 728, 732, - 720, 721, 722, 723, 724, 726, 732, 726, - 732, 726, 732, 726, 243, 725, 76, 725, - 727, 212, 726, 726, 243, 733, 76, 733, - 732, 514, 732, 732, 732, 727, 726, 735, - 39, 728, 732, 720, 721, 722, 723, 724, - 726, 734, 726, 734, 726, 732, 734, 726, - 243, 72, 76, 72, 732, 514, 732, 732, - 727, 726, 735, 55, 39, 728, 732, 720, - 721, 722, 723, 724, 726, 732, 726, 732, - 726, 732, 726, 243, 741, 76, 741, 533, - 743, 253, 744, 736, 737, 738, 739, 740, - 742, 243, 255, 76, 255, 256, 257, 742, - 243, 741, 76, 741, 533, 745, 39, 744, - 736, 737, 738, 739, 740, 742, 243, 255, - 76, 255, 256, 257, 736, 243, 255, 76, - 255, 256, 257, 737, 243, 255, 76, 255, - 256, 257, 738, 243, 255, 76, 255, 256, - 257, 739, 243, 258, 76, 258, 746, 352, - 746, 746, 745, 742, 261, 39, 744, 746, - 736, 737, 738, 739, 740, 742, 746, 742, - 747, 742, 746, 747, 742, 243, 748, 76, - 748, 749, 533, 749, 749, 745, 742, 253, - 744, 749, 736, 737, 738, 739, 740, 742, - 749, 742, 749, 742, 749, 742, 243, 356, - 76, 356, 749, 533, 749, 749, 745, 742, - 357, 253, 744, 749, 736, 737, 738, 739, - 740, 742, 749, 742, 749, 742, 749, 742, - 243, 741, 76, 741, 745, 257, 742, 742, - 243, 750, 76, 750, 749, 533, 749, 749, - 749, 745, 742, 752, 253, 744, 749, 736, - 737, 738, 739, 740, 742, 751, 742, 751, - 742, 749, 751, 742, 243, 488, 76, 488, - 749, 533, 749, 749, 745, 742, 752, 357, - 253, 744, 749, 736, 737, 738, 739, 740, - 742, 749, 742, 749, 742, 749, 742, 243, - 741, 76, 741, 533, 753, 253, 744, 736, - 737, 738, 739, 740, 742, 243, 258, 76, - 258, 746, 563, 746, 746, 745, 742, 261, - 39, 744, 746, 736, 737, 738, 739, 740, - 742, 746, 742, 747, 742, 746, 747, 742, - 243, 213, 76, 213, 754, 563, 754, 754, - 745, 742, 216, 39, 744, 754, 736, 737, - 738, 739, 740, 742, 754, 742, 755, 742, - 754, 755, 742, 243, 756, 76, 756, 757, - 533, 757, 757, 745, 742, 39, 744, 757, - 736, 737, 738, 739, 740, 742, 757, 742, - 757, 742, 757, 742, 243, 160, 76, 160, - 757, 533, 757, 757, 745, 742, 55, 39, - 744, 757, 736, 737, 738, 739, 740, 742, - 757, 742, 757, 742, 757, 742, 243, 758, - 76, 758, 757, 533, 757, 757, 757, 745, - 742, 752, 39, 744, 757, 736, 737, 738, - 739, 740, 742, 759, 742, 759, 742, 757, - 759, 742, 243, 72, 76, 72, 757, 533, - 757, 757, 745, 742, 752, 55, 39, 744, - 757, 736, 737, 738, 739, 740, 742, 757, - 742, 757, 742, 757, 742, 243, 760, 76, - 760, 264, 264, 264, 264, 256, 582, 257, - 264, 761, 761, 761, 264, 761, 243, 762, - 76, 762, 264, 264, 264, 256, 582, 266, - 257, 264, 264, 264, 264, 264, 243, 763, - 76, 763, 256, 582, 268, 257, 243, 764, - 76, 764, 765, 310, 765, 765, 712, 711, - 253, 713, 765, 706, 707, 708, 709, 710, - 711, 765, 711, 765, 711, 765, 711, 288, - 356, 76, 356, 765, 310, 765, 765, 712, - 711, 357, 253, 713, 765, 706, 707, 708, - 709, 710, 711, 765, 711, 765, 711, 765, - 711, 288, 714, 76, 714, 712, 257, 711, - 711, 288, 766, 76, 766, 765, 310, 765, - 765, 765, 712, 711, 768, 253, 713, 765, - 706, 707, 708, 709, 710, 711, 767, 711, - 767, 711, 765, 767, 711, 288, 488, 76, - 488, 765, 310, 765, 765, 712, 711, 768, - 357, 253, 713, 765, 706, 707, 708, 709, - 710, 711, 765, 711, 765, 711, 765, 711, - 288, 714, 76, 714, 310, 769, 253, 713, - 706, 707, 708, 709, 710, 711, 288, 715, - 76, 715, 716, 705, 716, 716, 712, 711, - 261, 39, 713, 716, 706, 707, 708, 709, - 710, 711, 716, 711, 717, 711, 716, 717, - 711, 288, 770, 76, 770, 297, 297, 297, - 297, 290, 772, 257, 297, 771, 771, 771, - 297, 771, 288, 773, 76, 773, 297, 297, - 297, 290, 772, 299, 257, 297, 297, 297, - 297, 297, 288, 774, 76, 774, 290, 772, - 301, 257, 288, 289, 76, 289, 775, 257, - 288, 776, 76, 776, 292, 777, 292, 292, - 290, 294, 257, 292, 292, 292, 295, 292, - 295, 288, 778, 76, 778, 779, 310, 779, - 779, 311, 309, 39, 312, 779, 303, 304, - 305, 306, 307, 309, 779, 309, 779, 309, - 779, 309, 288, 160, 76, 160, 779, 310, - 779, 779, 311, 309, 55, 39, 312, 779, - 303, 304, 305, 306, 307, 309, 779, 309, - 779, 309, 779, 309, 288, 780, 76, 780, - 779, 310, 779, 779, 779, 311, 309, 782, - 39, 312, 779, 303, 304, 305, 306, 307, - 309, 781, 309, 781, 309, 779, 781, 309, - 288, 72, 76, 72, 779, 310, 779, 779, - 311, 309, 782, 55, 39, 312, 779, 303, - 304, 305, 306, 307, 309, 779, 309, 779, - 309, 779, 309, 288, 714, 76, 714, 310, - 783, 253, 713, 706, 707, 708, 709, 710, - 711, 288, 313, 76, 313, 784, 705, 784, - 784, 712, 711, 216, 39, 713, 784, 706, - 707, 708, 709, 710, 711, 784, 711, 785, - 711, 784, 785, 711, 288, 786, 76, 786, - 787, 310, 787, 787, 712, 711, 39, 713, - 787, 706, 707, 708, 709, 710, 711, 787, - 711, 787, 711, 787, 711, 288, 160, 76, - 160, 787, 310, 787, 787, 712, 711, 55, - 39, 713, 787, 706, 707, 708, 709, 710, - 711, 787, 711, 787, 711, 787, 711, 288, - 788, 76, 788, 787, 310, 787, 787, 787, - 712, 711, 768, 39, 713, 787, 706, 707, - 708, 709, 710, 711, 789, 711, 789, 711, - 787, 789, 711, 288, 72, 76, 72, 787, - 310, 787, 787, 712, 711, 768, 55, 39, - 713, 787, 706, 707, 708, 709, 710, 711, - 787, 711, 787, 711, 787, 711, 288, 795, - 76, 795, 797, 798, 799, 790, 791, 792, - 793, 794, 796, 270, 271, 76, 271, 272, - 796, 270, 271, 76, 271, 272, 790, 270, - 271, 76, 271, 272, 791, 270, 271, 76, - 271, 272, 792, 270, 271, 76, 271, 272, - 793, 270, 280, 76, 280, 272, 281, 270, - 194, 76, 194, 800, 801, 800, 800, 798, - 796, 197, 799, 800, 790, 791, 792, 793, - 794, 796, 800, 796, 802, 796, 800, 802, - 796, 270, 803, 76, 803, 804, 797, 804, - 804, 798, 796, 799, 804, 790, 791, 792, - 793, 794, 796, 804, 796, 804, 796, 804, - 796, 270, 160, 76, 160, 804, 797, 804, - 804, 798, 796, 55, 799, 804, 790, 791, - 792, 793, 794, 796, 804, 796, 804, 796, - 804, 796, 270, 795, 76, 795, 798, 796, - 796, 270, 53, 76, 53, 797, 798, 55, - 799, 790, 791, 792, 793, 794, 796, 270, - 805, 76, 805, 804, 797, 804, 804, 804, - 798, 796, 807, 799, 804, 790, 791, 792, - 793, 794, 796, 806, 796, 806, 796, 804, - 806, 796, 270, 72, 76, 72, 804, 797, - 804, 804, 798, 796, 807, 55, 799, 804, - 790, 791, 792, 793, 794, 796, 804, 796, - 804, 796, 804, 796, 270, 813, 76, 813, - 797, 815, 816, 808, 809, 810, 811, 812, - 814, 270, 271, 76, 271, 272, 814, 270, - 813, 76, 813, 797, 817, 816, 808, 809, - 810, 811, 812, 814, 270, 271, 76, 271, - 272, 808, 270, 271, 76, 271, 272, 809, - 270, 271, 76, 271, 272, 810, 270, 271, - 76, 271, 272, 811, 270, 273, 76, 273, - 818, 801, 818, 818, 817, 814, 276, 816, - 818, 808, 809, 810, 811, 812, 814, 818, - 814, 819, 814, 818, 819, 814, 270, 820, - 76, 820, 821, 797, 821, 821, 817, 814, - 816, 821, 808, 809, 810, 811, 812, 814, - 821, 814, 821, 814, 821, 814, 270, 356, - 76, 356, 821, 797, 821, 821, 817, 814, - 357, 816, 821, 808, 809, 810, 811, 812, - 814, 821, 814, 821, 814, 821, 814, 270, - 813, 76, 813, 817, 814, 814, 270, 822, - 76, 822, 821, 797, 821, 821, 821, 817, - 814, 824, 816, 821, 808, 809, 810, 811, - 812, 814, 823, 814, 823, 814, 821, 823, - 814, 270, 488, 76, 488, 821, 797, 821, - 821, 817, 814, 824, 357, 816, 821, 808, - 809, 810, 811, 812, 814, 821, 814, 821, - 814, 821, 814, 270, 813, 76, 813, 797, - 825, 816, 808, 809, 810, 811, 812, 814, - 270, 273, 76, 273, 818, 826, 818, 818, - 817, 814, 276, 816, 818, 808, 809, 810, - 811, 812, 814, 818, 814, 819, 814, 818, - 819, 814, 270, 53, 76, 53, 797, 817, - 55, 816, 808, 809, 810, 811, 812, 814, - 270, 194, 76, 194, 827, 826, 827, 827, - 817, 814, 197, 816, 827, 808, 809, 810, - 811, 812, 814, 827, 814, 828, 814, 827, - 828, 814, 270, 829, 76, 829, 830, 797, - 830, 830, 817, 814, 816, 830, 808, 809, - 810, 811, 812, 814, 830, 814, 830, 814, - 830, 814, 270, 160, 76, 160, 830, 797, - 830, 830, 817, 814, 55, 816, 830, 808, - 809, 810, 811, 812, 814, 830, 814, 830, - 814, 830, 814, 270, 831, 76, 831, 830, - 797, 830, 830, 830, 817, 814, 824, 816, - 830, 808, 809, 810, 811, 812, 814, 832, - 814, 832, 814, 830, 832, 814, 270, 72, - 76, 72, 830, 797, 830, 830, 817, 814, - 824, 55, 816, 830, 808, 809, 810, 811, - 812, 814, 830, 814, 830, 814, 830, 814, - 270, 833, 76, 833, 279, 279, 279, 279, - 272, 835, 279, 834, 834, 834, 279, 834, - 270, 836, 76, 836, 279, 279, 279, 272, - 835, 281, 279, 279, 279, 279, 279, 270, - 837, 76, 837, 272, 835, 283, 270, 271, - 76, 271, 838, 270, 839, 76, 839, 274, - 840, 274, 274, 272, 276, 274, 274, 274, - 277, 274, 277, 270, 841, 76, 841, 256, - 843, 257, 842, 842, 842, 842, 243, 841, - 76, 841, 256, 843, 257, 243, 289, 76, - 289, 290, 212, 288, 844, 76, 844, 264, - 264, 264, 264, 256, 846, 257, 264, 845, - 845, 845, 264, 845, 243, 847, 76, 847, - 264, 264, 264, 256, 846, 266, 257, 264, - 264, 264, 264, 264, 243, 848, 76, 848, - 256, 846, 268, 257, 243, 255, 76, 255, - 849, 257, 243, 850, 76, 850, 851, 852, - 851, 851, 256, 853, 257, 851, 851, 851, - 854, 851, 854, 243, 855, 76, 855, 856, - 856, 856, 256, 257, 856, 856, 856, 856, - 856, 243, 537, 76, 537, 856, 856, 856, - 256, 538, 257, 856, 856, 856, 856, 856, - 243, 857, 76, 857, 856, 856, 856, 856, - 256, 846, 257, 856, 858, 858, 858, 856, - 858, 243, 859, 76, 859, 856, 856, 856, - 256, 846, 538, 257, 856, 856, 856, 856, - 856, 243, 860, 76, 860, 256, 846, 540, - 257, 243, 213, 76, 213, 861, 862, 861, - 861, 569, 250, 216, 39, 254, 861, 244, - 245, 246, 247, 248, 250, 861, 250, 863, - 250, 861, 863, 250, 243, 864, 76, 864, - 865, 251, 865, 865, 569, 250, 39, 254, - 865, 244, 245, 246, 247, 248, 250, 865, - 250, 865, 250, 865, 250, 243, 160, 76, - 160, 865, 251, 865, 865, 569, 250, 55, - 39, 254, 865, 244, 245, 246, 247, 248, - 250, 865, 250, 865, 250, 865, 250, 243, - 53, 76, 53, 251, 569, 55, 39, 254, - 244, 245, 246, 247, 248, 250, 243, 866, - 76, 866, 865, 251, 865, 865, 865, 569, - 250, 576, 39, 254, 865, 244, 245, 246, - 247, 248, 250, 867, 250, 867, 250, 865, - 867, 250, 243, 72, 76, 72, 865, 251, - 865, 865, 569, 250, 576, 55, 39, 254, - 865, 244, 245, 246, 247, 248, 250, 865, - 250, 865, 250, 865, 250, 243, 868, 76, - 868, 219, 219, 219, 219, 211, 870, 212, - 219, 869, 869, 869, 219, 869, 209, 871, - 76, 871, 219, 219, 219, 211, 870, 221, - 212, 219, 219, 219, 219, 219, 209, 872, - 76, 872, 211, 870, 223, 212, 209, 255, - 76, 255, 873, 257, 243, 874, 76, 874, - 875, 876, 875, 875, 256, 877, 257, 875, - 875, 875, 878, 875, 878, 243, 879, 76, - 879, 880, 880, 880, 256, 257, 880, 880, - 880, 880, 880, 243, 346, 76, 346, 880, - 880, 880, 256, 347, 257, 880, 880, 880, - 880, 880, 243, 881, 76, 881, 880, 880, - 880, 880, 256, 846, 257, 880, 882, 882, - 882, 880, 882, 243, 883, 76, 883, 880, - 880, 880, 256, 846, 347, 257, 880, 880, - 880, 880, 880, 243, 884, 76, 884, 256, - 846, 349, 257, 243, 890, 76, 890, 892, - 893, 894, 885, 886, 887, 888, 889, 891, - 191, 192, 76, 192, 193, 891, 191, 192, - 76, 192, 193, 885, 191, 192, 76, 192, - 193, 886, 191, 192, 76, 192, 193, 887, - 191, 192, 76, 192, 193, 888, 191, 201, - 76, 201, 193, 202, 191, 194, 76, 194, - 895, 896, 895, 895, 893, 891, 197, 894, - 895, 885, 886, 887, 888, 889, 891, 895, - 891, 897, 891, 895, 897, 891, 191, 898, - 76, 898, 899, 892, 899, 899, 893, 891, - 894, 899, 885, 886, 887, 888, 889, 891, - 899, 891, 899, 891, 899, 891, 191, 160, - 76, 160, 899, 892, 899, 899, 893, 891, - 55, 894, 899, 885, 886, 887, 888, 889, - 891, 899, 891, 899, 891, 899, 891, 191, - 890, 76, 890, 893, 891, 891, 191, 53, - 76, 53, 892, 893, 55, 894, 885, 886, - 887, 888, 889, 891, 191, 900, 76, 900, - 899, 892, 899, 899, 899, 893, 891, 902, - 894, 899, 885, 886, 887, 888, 889, 891, - 901, 891, 901, 891, 899, 901, 891, 191, - 72, 76, 72, 899, 892, 899, 899, 893, - 891, 902, 55, 894, 899, 885, 886, 887, - 888, 889, 891, 899, 891, 899, 891, 899, - 891, 191, 908, 76, 908, 910, 911, 912, - 903, 904, 905, 906, 907, 909, 270, 271, - 76, 271, 272, 909, 270, 908, 76, 908, - 910, 913, 912, 903, 904, 905, 906, 907, - 909, 270, 271, 76, 271, 272, 903, 270, - 271, 76, 271, 272, 904, 270, 271, 76, - 271, 272, 905, 270, 271, 76, 271, 272, - 906, 270, 914, 76, 914, 272, 915, 270, - 916, 76, 916, 272, 917, 270, 271, 76, - 271, 272, 918, 918, 270, 919, 76, 919, - 272, 921, 920, 920, 920, 920, 270, 919, - 76, 919, 272, 921, 270, 255, 76, 255, - 256, 243, 273, 76, 273, 922, 801, 922, - 922, 913, 909, 276, 912, 922, 903, 904, - 905, 906, 907, 909, 922, 909, 923, 909, - 922, 923, 909, 270, 924, 76, 924, 925, - 910, 925, 925, 913, 909, 912, 925, 903, - 904, 905, 906, 907, 909, 925, 909, 925, - 909, 925, 909, 270, 356, 76, 356, 925, - 910, 925, 925, 913, 909, 357, 912, 925, - 903, 904, 905, 906, 907, 909, 925, 909, - 925, 909, 925, 909, 270, 908, 76, 908, - 913, 909, 909, 270, 926, 76, 926, 925, - 910, 925, 925, 925, 913, 909, 928, 912, - 925, 903, 904, 905, 906, 907, 909, 927, - 909, 927, 909, 925, 927, 909, 270, 488, - 76, 488, 925, 910, 925, 925, 913, 909, - 928, 357, 912, 925, 903, 904, 905, 906, - 907, 909, 925, 909, 925, 909, 925, 909, - 270, 908, 76, 908, 910, 929, 912, 903, - 904, 905, 906, 907, 909, 270, 273, 76, - 273, 922, 826, 922, 922, 913, 909, 276, - 912, 922, 903, 904, 905, 906, 907, 909, - 922, 909, 923, 909, 922, 923, 909, 270, - 194, 76, 194, 930, 931, 930, 930, 913, - 909, 197, 912, 930, 903, 904, 905, 906, - 907, 909, 930, 909, 932, 909, 930, 932, - 909, 270, 933, 76, 933, 934, 910, 934, - 934, 913, 909, 912, 934, 903, 904, 905, - 906, 907, 909, 934, 909, 934, 909, 934, - 909, 270, 160, 76, 160, 934, 910, 934, - 934, 913, 909, 55, 912, 934, 903, 904, - 905, 906, 907, 909, 934, 909, 934, 909, - 934, 909, 270, 53, 76, 53, 910, 913, - 55, 912, 903, 904, 905, 906, 907, 909, - 270, 935, 76, 935, 934, 910, 934, 934, - 934, 913, 909, 928, 912, 934, 903, 904, - 905, 906, 907, 909, 936, 909, 936, 909, - 934, 936, 909, 270, 72, 76, 72, 934, - 910, 934, 934, 913, 909, 928, 55, 912, - 934, 903, 904, 905, 906, 907, 909, 934, - 909, 934, 909, 934, 909, 270, 937, 76, - 937, 200, 200, 200, 200, 193, 939, 200, - 938, 938, 938, 200, 938, 191, 940, 76, - 940, 200, 200, 200, 193, 939, 202, 200, - 200, 200, 200, 200, 191, 941, 76, 941, - 193, 939, 204, 191, 271, 76, 271, 942, - 270, 943, 76, 943, 944, 945, 944, 944, - 272, 946, 944, 944, 944, 947, 944, 947, - 270, 948, 76, 948, 949, 949, 949, 272, - 949, 949, 949, 949, 949, 270, 914, 76, - 914, 949, 949, 949, 272, 915, 949, 949, - 949, 949, 949, 270, 950, 76, 950, 949, - 949, 949, 949, 272, 835, 949, 951, 951, - 951, 949, 951, 270, 952, 76, 952, 949, - 949, 949, 272, 835, 915, 949, 949, 949, - 949, 949, 270, 953, 76, 953, 272, 835, - 917, 270, 1, 0 + 92, 96, 76, 96, 117, 118, 117, 117, + 115, 113, 99, 95, 116, 117, 107, 108, + 109, 110, 111, 113, 117, 113, 119, 113, + 117, 119, 113, 92, 120, 76, 120, 121, + 114, 121, 121, 115, 113, 95, 116, 121, + 107, 108, 109, 110, 111, 113, 121, 113, + 121, 113, 121, 113, 92, 102, 76, 102, + 121, 114, 121, 121, 115, 113, 103, 95, + 116, 121, 107, 108, 109, 110, 111, 113, + 121, 113, 121, 113, 121, 113, 92, 112, + 76, 112, 115, 95, 113, 113, 92, 102, + 76, 102, 114, 115, 103, 95, 116, 107, + 108, 109, 110, 111, 113, 92, 122, 76, + 122, 121, 114, 121, 121, 121, 115, 113, + 95, 116, 121, 107, 108, 109, 110, 111, + 113, 123, 113, 123, 113, 121, 123, 113, + 92, 72, 76, 72, 121, 114, 121, 121, + 115, 113, 55, 95, 116, 121, 107, 108, + 109, 110, 111, 113, 121, 113, 121, 113, + 121, 113, 92, 129, 76, 129, 131, 132, + 133, 124, 125, 126, 127, 128, 130, 74, + 75, 76, 75, 77, 130, 74, 75, 76, + 75, 77, 124, 74, 75, 76, 75, 77, + 125, 74, 75, 76, 75, 77, 126, 74, + 75, 76, 75, 77, 127, 74, 84, 76, + 84, 77, 85, 74, 78, 76, 78, 134, + 135, 134, 134, 132, 130, 81, 133, 134, + 124, 125, 126, 127, 128, 130, 134, 130, + 136, 130, 134, 136, 130, 74, 137, 76, + 137, 138, 131, 138, 138, 132, 130, 133, + 138, 124, 125, 126, 127, 128, 130, 138, + 130, 138, 130, 138, 130, 74, 84, 76, + 84, 138, 131, 138, 138, 132, 130, 85, + 133, 138, 124, 125, 126, 127, 128, 130, + 138, 130, 138, 130, 138, 130, 74, 129, + 76, 129, 132, 130, 130, 74, 84, 76, + 84, 131, 132, 85, 133, 124, 125, 126, + 127, 128, 130, 74, 139, 76, 139, 138, + 131, 138, 138, 138, 132, 130, 133, 138, + 124, 125, 126, 127, 128, 130, 140, 130, + 140, 130, 138, 140, 130, 74, 72, 76, + 72, 138, 131, 138, 138, 132, 130, 55, + 133, 138, 124, 125, 126, 127, 128, 130, + 138, 130, 138, 130, 138, 130, 74, 141, + 51, 141, 52, 52, 52, 52, 142, 143, + 52, 142, 142, 142, 52, 142, 1, 144, + 54, 144, 52, 52, 52, 143, 55, 52, + 52, 52, 52, 52, 52, 1, 145, 57, + 145, 143, 33, 1, 146, 147, 76, 147, + 148, 146, 149, 76, 149, 150, 151, 150, + 150, 148, 152, 150, 150, 150, 153, 150, + 153, 146, 154, 76, 154, 155, 155, 155, + 148, 155, 155, 155, 155, 155, 146, 156, + 76, 156, 155, 155, 155, 148, 157, 155, + 155, 155, 155, 155, 146, 158, 76, 158, + 148, 159, 146, 147, 76, 147, 148, 160, + 160, 146, 161, 76, 161, 148, 163, 162, + 162, 162, 162, 146, 161, 76, 161, 148, + 163, 146, 165, 76, 165, 166, 164, 165, + 76, 165, 166, 167, 164, 168, 76, 168, + 169, 170, 169, 169, 166, 171, 167, 169, + 169, 169, 172, 169, 172, 164, 173, 76, + 173, 174, 174, 174, 166, 167, 174, 174, + 174, 174, 174, 164, 175, 76, 175, 174, + 174, 174, 166, 176, 167, 174, 174, 174, + 174, 174, 164, 177, 76, 177, 166, 178, + 167, 164, 165, 76, 165, 166, 167, 179, + 179, 164, 185, 76, 185, 187, 188, 167, + 189, 180, 181, 182, 183, 184, 186, 164, + 165, 76, 165, 166, 167, 186, 164, 165, + 76, 165, 166, 167, 180, 164, 165, 76, + 165, 166, 167, 181, 164, 165, 76, 165, + 166, 167, 182, 164, 165, 76, 165, 166, + 167, 183, 164, 175, 76, 175, 166, 176, + 167, 164, 168, 76, 168, 190, 191, 190, + 190, 188, 186, 171, 167, 189, 190, 180, + 181, 182, 183, 184, 186, 190, 186, 192, + 186, 190, 192, 186, 164, 193, 76, 193, + 194, 187, 194, 194, 188, 186, 167, 189, + 194, 180, 181, 182, 183, 184, 186, 194, + 186, 194, 186, 194, 186, 164, 175, 76, + 175, 194, 187, 194, 194, 188, 186, 176, + 167, 189, 194, 180, 181, 182, 183, 184, + 186, 194, 186, 194, 186, 194, 186, 164, + 185, 76, 185, 188, 167, 186, 186, 164, + 175, 76, 175, 187, 188, 176, 167, 189, + 180, 181, 182, 183, 184, 186, 164, 195, + 76, 195, 194, 187, 194, 194, 194, 188, + 186, 197, 167, 189, 194, 180, 181, 182, + 183, 184, 186, 196, 186, 196, 186, 194, + 196, 186, 164, 72, 76, 72, 194, 187, + 194, 194, 188, 186, 197, 55, 167, 189, + 194, 180, 181, 182, 183, 184, 186, 194, + 186, 194, 186, 194, 186, 164, 203, 76, + 203, 187, 205, 167, 206, 198, 199, 200, + 201, 202, 204, 164, 165, 76, 165, 166, + 167, 204, 164, 203, 76, 203, 187, 207, + 167, 206, 198, 199, 200, 201, 202, 204, + 164, 165, 76, 165, 166, 167, 198, 164, + 165, 76, 165, 166, 167, 199, 164, 165, + 76, 165, 166, 167, 200, 164, 165, 76, + 165, 166, 167, 201, 164, 168, 76, 168, + 208, 191, 208, 208, 207, 204, 171, 167, + 206, 208, 198, 199, 200, 201, 202, 204, + 208, 204, 209, 204, 208, 209, 204, 164, + 210, 76, 210, 211, 187, 211, 211, 207, + 204, 167, 206, 211, 198, 199, 200, 201, + 202, 204, 211, 204, 211, 204, 211, 204, + 164, 175, 76, 175, 211, 187, 211, 211, + 207, 204, 176, 167, 206, 211, 198, 199, + 200, 201, 202, 204, 211, 204, 211, 204, + 211, 204, 164, 203, 76, 203, 207, 167, + 204, 204, 164, 212, 76, 212, 211, 187, + 211, 211, 211, 207, 204, 214, 167, 206, + 211, 198, 199, 200, 201, 202, 204, 213, + 204, 213, 204, 211, 213, 204, 164, 215, + 76, 215, 211, 187, 211, 211, 207, 204, + 214, 216, 167, 206, 211, 198, 199, 200, + 201, 202, 204, 211, 204, 211, 204, 211, + 204, 164, 217, 76, 217, 77, 218, 219, + 74, 75, 76, 75, 220, 74, 221, 76, + 221, 79, 222, 79, 79, 77, 81, 79, + 79, 79, 79, 79, 74, 228, 76, 228, + 131, 230, 231, 223, 224, 225, 226, 227, + 229, 74, 75, 76, 75, 77, 229, 74, + 75, 76, 75, 77, 223, 74, 75, 76, + 75, 77, 224, 74, 75, 76, 75, 77, + 225, 74, 75, 76, 75, 77, 226, 74, + 78, 76, 78, 232, 135, 232, 232, 230, + 229, 81, 231, 232, 223, 224, 225, 226, + 227, 229, 232, 229, 233, 229, 232, 233, + 229, 74, 234, 76, 234, 235, 131, 235, + 235, 230, 229, 231, 235, 223, 224, 225, + 226, 227, 229, 235, 229, 235, 229, 235, + 229, 74, 84, 76, 84, 235, 131, 235, + 235, 230, 229, 85, 231, 235, 223, 224, + 225, 226, 227, 229, 235, 229, 235, 229, + 235, 229, 74, 228, 76, 228, 230, 229, + 229, 74, 236, 76, 236, 235, 131, 235, + 235, 235, 230, 229, 231, 235, 223, 224, + 225, 226, 227, 229, 237, 229, 237, 229, + 235, 237, 229, 74, 215, 76, 215, 235, + 131, 235, 235, 230, 229, 216, 231, 235, + 223, 224, 225, 226, 227, 229, 235, 229, + 235, 229, 235, 229, 74, 75, 76, 75, + 77, 238, 238, 74, 239, 76, 239, 77, + 241, 240, 240, 240, 240, 74, 239, 76, + 239, 77, 241, 74, 243, 76, 243, 244, + 242, 243, 76, 243, 244, 245, 242, 246, + 76, 246, 247, 248, 247, 247, 244, 249, + 245, 247, 247, 247, 247, 247, 242, 250, + 76, 250, 251, 251, 251, 244, 245, 251, + 251, 251, 251, 251, 242, 252, 76, 252, + 251, 251, 251, 244, 253, 245, 251, 251, + 251, 251, 251, 242, 254, 76, 254, 244, + 255, 245, 242, 243, 76, 243, 244, 245, + 256, 256, 242, 257, 76, 257, 258, 74, + 259, 76, 259, 260, 261, 260, 260, 77, + 262, 260, 260, 260, 263, 260, 263, 74, + 264, 76, 264, 265, 265, 265, 77, 265, + 265, 265, 265, 265, 74, 266, 76, 266, + 265, 265, 265, 77, 216, 265, 265, 265, + 265, 265, 74, 267, 76, 267, 77, 219, + 74, 273, 76, 273, 275, 276, 277, 268, + 269, 270, 271, 272, 274, 74, 75, 76, + 75, 77, 274, 74, 75, 76, 75, 77, + 268, 74, 75, 76, 75, 77, 269, 74, + 75, 76, 75, 77, 270, 74, 75, 76, + 75, 77, 271, 74, 266, 76, 266, 77, + 216, 74, 78, 76, 78, 278, 279, 278, + 278, 276, 274, 81, 277, 278, 268, 269, + 270, 271, 272, 274, 278, 274, 280, 274, + 278, 280, 274, 74, 281, 76, 281, 282, + 275, 282, 282, 276, 274, 277, 282, 268, + 269, 270, 271, 272, 274, 282, 274, 282, + 274, 282, 274, 74, 84, 76, 84, 282, + 275, 282, 282, 276, 274, 85, 277, 282, + 268, 269, 270, 271, 272, 274, 282, 274, + 282, 274, 282, 274, 74, 273, 76, 273, + 276, 274, 274, 74, 266, 76, 266, 131, + 132, 216, 133, 124, 125, 126, 127, 128, + 130, 74, 283, 76, 283, 282, 275, 282, + 282, 282, 276, 274, 277, 282, 268, 269, + 270, 271, 272, 274, 284, 274, 284, 274, + 282, 284, 274, 74, 72, 76, 72, 282, + 275, 282, 282, 276, 274, 55, 277, 282, + 268, 269, 270, 271, 272, 274, 282, 274, + 282, 274, 282, 274, 74, 285, 76, 285, + 265, 265, 265, 265, 77, 218, 265, 286, + 286, 286, 265, 286, 74, 215, 76, 215, + 265, 265, 265, 77, 218, 216, 265, 265, + 265, 265, 265, 74, 292, 76, 292, 294, + 295, 245, 296, 287, 288, 289, 290, 291, + 293, 242, 243, 76, 243, 244, 245, 293, + 242, 243, 76, 243, 244, 245, 287, 242, + 243, 76, 243, 244, 245, 288, 242, 243, + 76, 243, 244, 245, 289, 242, 243, 76, + 243, 244, 245, 290, 242, 252, 76, 252, + 244, 253, 245, 242, 246, 76, 246, 297, + 298, 297, 297, 295, 293, 249, 245, 296, + 297, 287, 288, 289, 290, 291, 293, 297, + 293, 299, 293, 297, 299, 293, 242, 300, + 76, 300, 301, 294, 301, 301, 295, 293, + 245, 296, 301, 287, 288, 289, 290, 291, + 293, 301, 293, 301, 293, 301, 293, 242, + 252, 76, 252, 301, 294, 301, 301, 295, + 293, 253, 245, 296, 301, 287, 288, 289, + 290, 291, 293, 301, 293, 301, 293, 301, + 293, 242, 292, 76, 292, 295, 245, 293, + 293, 242, 252, 76, 252, 294, 295, 253, + 245, 296, 287, 288, 289, 290, 291, 293, + 242, 302, 76, 302, 301, 294, 301, 301, + 301, 295, 293, 245, 296, 301, 287, 288, + 289, 290, 291, 293, 303, 293, 303, 293, + 301, 303, 293, 242, 304, 76, 304, 301, + 294, 301, 301, 295, 293, 305, 245, 296, + 301, 287, 288, 289, 290, 291, 293, 301, + 293, 301, 293, 301, 293, 242, 306, 307, + 306, 308, 309, 39, 38, 310, 39, 38, + 311, 311, 39, 38, 311, 311, 309, 39, + 38, 39, 312, 312, 38, 245, 313, 314, + 76, 314, 315, 245, 313, 316, 76, 316, + 317, 318, 317, 317, 315, 319, 245, 317, + 317, 317, 317, 317, 313, 320, 76, 320, + 321, 321, 321, 315, 245, 321, 321, 321, + 321, 321, 313, 322, 76, 322, 321, 321, + 321, 315, 323, 245, 321, 321, 321, 321, + 321, 313, 324, 76, 324, 315, 325, 245, + 313, 314, 76, 314, 315, 245, 326, 326, + 313, 327, 76, 327, 315, 329, 245, 328, + 328, 328, 328, 313, 327, 76, 327, 315, + 329, 245, 313, 243, 76, 243, 244, 39, + 242, 335, 76, 335, 337, 338, 39, 339, + 330, 331, 332, 333, 334, 336, 313, 314, + 76, 314, 315, 245, 336, 313, 314, 76, + 314, 315, 245, 330, 313, 314, 76, 314, + 315, 245, 331, 313, 314, 76, 314, 315, + 245, 332, 313, 314, 76, 314, 315, 245, + 333, 313, 322, 76, 322, 315, 323, 245, + 313, 316, 76, 316, 340, 341, 340, 340, + 338, 336, 319, 39, 339, 340, 330, 331, + 332, 333, 334, 336, 340, 336, 342, 336, + 340, 342, 336, 313, 343, 76, 343, 344, + 337, 344, 344, 338, 336, 39, 339, 344, + 330, 331, 332, 333, 334, 336, 344, 336, + 344, 336, 344, 336, 313, 322, 76, 322, + 344, 337, 344, 344, 338, 336, 323, 39, + 339, 344, 330, 331, 332, 333, 334, 336, + 344, 336, 344, 336, 344, 336, 313, 335, + 76, 335, 338, 39, 336, 336, 313, 322, + 76, 322, 337, 338, 323, 39, 339, 330, + 331, 332, 333, 334, 336, 313, 345, 76, + 345, 344, 337, 344, 344, 344, 338, 336, + 39, 339, 344, 330, 331, 332, 333, 334, + 336, 346, 336, 346, 336, 344, 346, 336, + 313, 304, 76, 304, 344, 337, 344, 344, + 338, 336, 305, 39, 339, 344, 330, 331, + 332, 333, 334, 336, 344, 336, 344, 336, + 344, 336, 313, 203, 76, 203, 187, 347, + 167, 206, 198, 199, 200, 201, 202, 204, + 164, 348, 76, 348, 208, 349, 208, 208, + 207, 204, 171, 167, 206, 208, 198, 199, + 200, 201, 202, 204, 208, 204, 209, 204, + 208, 209, 204, 164, 348, 76, 348, 169, + 350, 169, 169, 166, 171, 167, 169, 169, + 169, 172, 169, 172, 164, 351, 76, 351, + 174, 174, 174, 174, 166, 353, 167, 174, + 352, 352, 352, 174, 352, 164, 354, 76, + 354, 174, 174, 174, 166, 353, 176, 167, + 174, 174, 174, 174, 174, 164, 355, 76, + 355, 166, 353, 178, 167, 164, 165, 76, + 165, 356, 167, 164, 175, 76, 175, 187, + 207, 176, 167, 206, 198, 199, 200, 201, + 202, 204, 164, 348, 76, 348, 208, 349, + 208, 208, 207, 204, 171, 167, 206, 208, + 198, 199, 200, 201, 202, 204, 208, 204, + 357, 204, 208, 357, 204, 164, 358, 76, + 358, 211, 187, 211, 211, 211, 207, 204, + 214, 167, 206, 211, 198, 199, 200, 201, + 202, 204, 359, 204, 359, 204, 211, 359, + 204, 164, 72, 76, 72, 211, 187, 211, + 211, 207, 204, 214, 55, 167, 206, 211, + 198, 199, 200, 201, 202, 204, 211, 204, + 211, 204, 211, 204, 164, 365, 76, 365, + 367, 368, 369, 360, 361, 362, 363, 364, + 366, 146, 147, 76, 147, 148, 366, 146, + 147, 76, 147, 148, 360, 146, 147, 76, + 147, 148, 361, 146, 147, 76, 147, 148, + 362, 146, 147, 76, 147, 148, 363, 146, + 156, 76, 156, 148, 157, 146, 149, 76, + 149, 370, 371, 370, 370, 368, 366, 152, + 369, 370, 360, 361, 362, 363, 364, 366, + 370, 366, 372, 366, 370, 372, 366, 146, + 373, 76, 373, 374, 367, 374, 374, 368, + 366, 369, 374, 360, 361, 362, 363, 364, + 366, 374, 366, 374, 366, 374, 366, 146, + 156, 76, 156, 374, 367, 374, 374, 368, + 366, 157, 369, 374, 360, 361, 362, 363, + 364, 366, 374, 366, 374, 366, 374, 366, + 146, 365, 76, 365, 368, 366, 366, 146, + 156, 76, 156, 367, 368, 157, 369, 360, + 361, 362, 363, 364, 366, 146, 375, 76, + 375, 374, 367, 374, 374, 374, 368, 366, + 377, 369, 374, 360, 361, 362, 363, 364, + 366, 376, 366, 376, 366, 374, 376, 366, + 146, 72, 76, 72, 374, 367, 374, 374, + 368, 366, 377, 55, 369, 374, 360, 361, + 362, 363, 364, 366, 374, 366, 374, 366, + 374, 366, 146, 383, 76, 383, 367, 385, + 386, 378, 379, 380, 381, 382, 384, 146, + 147, 76, 147, 148, 384, 146, 383, 76, + 383, 367, 387, 386, 378, 379, 380, 381, + 382, 384, 146, 147, 76, 147, 148, 378, + 146, 147, 76, 147, 148, 379, 146, 147, + 76, 147, 148, 380, 146, 147, 76, 147, + 148, 381, 146, 149, 76, 149, 388, 371, + 388, 388, 387, 384, 152, 386, 388, 378, + 379, 380, 381, 382, 384, 388, 384, 389, + 384, 388, 389, 384, 146, 390, 76, 390, + 391, 367, 391, 391, 387, 384, 386, 391, + 378, 379, 380, 381, 382, 384, 391, 384, + 391, 384, 391, 384, 146, 156, 76, 156, + 391, 367, 391, 391, 387, 384, 157, 386, + 391, 378, 379, 380, 381, 382, 384, 391, + 384, 391, 384, 391, 384, 146, 383, 76, + 383, 387, 384, 384, 146, 392, 76, 392, + 391, 367, 391, 391, 391, 387, 384, 394, + 386, 391, 378, 379, 380, 381, 382, 384, + 393, 384, 393, 384, 391, 393, 384, 146, + 215, 76, 215, 391, 367, 391, 391, 387, + 384, 394, 216, 386, 391, 378, 379, 380, + 381, 382, 384, 391, 384, 391, 384, 391, + 384, 146, 383, 76, 383, 367, 395, 386, + 378, 379, 380, 381, 382, 384, 146, 396, + 76, 396, 388, 397, 388, 388, 387, 384, + 152, 386, 388, 378, 379, 380, 381, 382, + 384, 388, 384, 389, 384, 388, 389, 384, + 146, 396, 76, 396, 150, 398, 150, 150, + 148, 152, 150, 150, 150, 153, 150, 153, + 146, 399, 76, 399, 155, 155, 155, 155, + 148, 401, 155, 400, 400, 400, 155, 400, + 146, 402, 76, 402, 155, 155, 155, 148, + 401, 157, 155, 155, 155, 155, 155, 146, + 403, 76, 403, 148, 401, 159, 146, 147, + 76, 147, 404, 146, 156, 76, 156, 367, + 387, 157, 386, 378, 379, 380, 381, 382, + 384, 146, 396, 76, 396, 388, 397, 388, + 388, 387, 384, 152, 386, 388, 378, 379, + 380, 381, 382, 384, 388, 384, 405, 384, + 388, 405, 384, 146, 406, 76, 406, 391, + 367, 391, 391, 391, 387, 384, 394, 386, + 391, 378, 379, 380, 381, 382, 384, 407, + 384, 407, 384, 391, 407, 384, 146, 72, + 76, 72, 391, 367, 391, 391, 387, 384, + 394, 55, 386, 391, 378, 379, 380, 381, + 382, 384, 391, 384, 391, 384, 391, 384, + 146, 1, 0 }; static const short _tsip_machine_parser_header_P_Asserted_Identity_trans_targs[] = { 2, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 21, 22, 39, - 44, 28, 133, 23, 24, 24, 25, 26, + 44, 28, 101, 23, 24, 24, 25, 26, 27, 28, 29, 30, 29, 31, 32, 33, - 33, 34, 35, 672, 35, 36, 54, 37, + 33, 34, 35, 285, 35, 36, 54, 37, 38, 38, 40, 42, 39, 41, 25, 28, 41, 25, 43, 45, 46, 47, 48, 49, 44, 50, 52, 53, 51, 55, 54, 57, 56, 56, 58, 58, 34, 59, 59, 60, - 119, 63, 61, 60, 62, 63, 62, 63, + 87, 63, 61, 60, 62, 63, 62, 63, 64, 65, 64, 66, 67, 67, 68, 58, 68, 69, 73, 72, 70, 69, 71, 72, 71, 72, 67, 74, 75, 76, 77, 78, - 73, 73, 79, 80, 114, 81, 108, 115, - 88, 116, 82, 89, 94, 104, 83, 84, - 84, 85, 86, 87, 88, 32, 90, 92, - 89, 91, 85, 88, 91, 85, 93, 95, - 96, 97, 98, 99, 94, 100, 102, 103, - 101, 105, 104, 107, 106, 106, 109, 108, - 110, 110, 111, 35, 112, 113, 117, 116, - 118, 120, 121, 122, 123, 124, 119, 119, - 125, 126, 129, 127, 130, 131, 128, 127, - 132, 131, 134, 133, 136, 135, 135, 137, - 137, 138, 138, 139, 621, 142, 662, 140, - 139, 141, 142, 141, 142, 143, 144, 143, - 145, 146, 146, 147, 137, 147, 148, 152, - 151, 611, 149, 148, 150, 151, 150, 151, - 146, 153, 154, 155, 156, 157, 152, 152, - 158, 159, 162, 160, 163, 164, 161, 160, - 165, 164, 166, 167, 378, 380, 381, 382, - 383, 379, 379, 217, 605, 238, 387, 167, - 168, 173, 168, 169, 330, 172, 595, 170, - 169, 171, 172, 171, 172, 592, 173, 173, - 174, 174, 175, 552, 178, 587, 176, 175, - 177, 178, 177, 178, 179, 180, 179, 181, - 182, 182, 183, 183, 184, 188, 187, 537, - 185, 184, 186, 187, 186, 187, 182, 189, - 190, 191, 192, 193, 188, 188, 194, 195, - 481, 196, 542, 480, 544, 197, 394, 198, - 199, 200, 201, 202, 197, 197, 203, 206, - 204, 207, 208, 205, 204, 209, 208, 210, - 211, 213, 214, 215, 216, 212, 212, 374, - 327, 220, 218, 219, 218, 219, 167, 221, - 328, 369, 222, 221, 223, 228, 223, 224, - 228, 224, 225, 297, 228, 310, 226, 225, - 227, 227, 229, 230, 229, 231, 232, 232, - 233, 233, 234, 239, 237, 235, 234, 236, - 237, 236, 237, 232, 238, 240, 241, 242, - 243, 244, 239, 239, 245, 246, 292, 247, - 255, 293, 294, 248, 251, 249, 250, 250, - 252, 251, 254, 253, 253, 256, 255, 257, - 257, 258, 261, 259, 260, 261, 262, 265, - 263, 264, 264, 266, 265, 268, 267, 267, - 269, 269, 270, 270, 271, 278, 274, 272, - 271, 273, 274, 273, 274, 275, 276, 275, - 277, 279, 280, 281, 282, 283, 278, 278, - 284, 285, 288, 286, 289, 290, 287, 286, - 291, 290, 295, 294, 296, 298, 299, 300, - 301, 302, 297, 297, 303, 304, 307, 305, - 308, 306, 305, 309, 308, 311, 310, 313, - 312, 312, 314, 314, 315, 316, 317, 318, - 319, 320, 315, 315, 321, 324, 322, 325, - 323, 322, 326, 325, 329, 331, 332, 333, - 334, 330, 335, 336, 339, 330, 337, 340, - 341, 338, 337, 342, 341, 343, 344, 346, - 347, 348, 349, 345, 345, 350, 364, 358, - 355, 351, 352, 351, 352, 353, 354, 353, - 356, 359, 357, 356, 360, 359, 361, 362, - 363, 365, 367, 366, 365, 368, 367, 370, - 369, 371, 372, 373, 375, 377, 392, 376, - 375, 384, 385, 388, 386, 385, 389, 388, - 390, 391, 393, 392, 395, 394, 397, 396, - 396, 398, 398, 399, 400, 401, 402, 403, - 404, 399, 399, 405, 479, 406, 482, 407, - 406, 408, 413, 408, 409, 413, 409, 410, - 417, 413, 431, 411, 410, 412, 412, 414, - 415, 414, 416, 418, 419, 420, 421, 422, - 417, 417, 423, 424, 427, 425, 428, 426, - 425, 429, 428, 430, 432, 431, 434, 433, - 433, 435, 435, 436, 437, 438, 439, 440, - 441, 436, 436, 442, 475, 443, 473, 476, - 444, 456, 445, 446, 447, 448, 449, 444, - 444, 450, 453, 451, 454, 452, 451, 455, - 454, 457, 456, 459, 458, 458, 460, 460, - 461, 462, 463, 464, 465, 466, 461, 461, - 467, 470, 468, 471, 469, 468, 472, 471, - 474, 473, 477, 476, 478, 483, 482, 484, - 485, 486, 487, 489, 490, 491, 492, 488, - 493, 532, 488, 494, 530, 533, 495, 527, - 496, 497, 498, 499, 500, 495, 495, 501, - 504, 502, 505, 503, 502, 506, 505, 507, - 508, 510, 511, 512, 513, 509, 509, 522, - 517, 514, 515, 518, 516, 515, 519, 518, - 520, 521, 523, 525, 524, 523, 526, 525, - 528, 527, 529, 529, 531, 530, 534, 533, - 535, 536, 538, 537, 540, 539, 539, 541, - 541, 488, 543, 542, 545, 544, 546, 547, - 548, 550, 549, 548, 551, 550, 553, 554, - 555, 556, 557, 552, 552, 558, 559, 562, - 560, 563, 564, 561, 560, 565, 564, 566, - 567, 569, 570, 571, 572, 568, 568, 582, - 576, 573, 574, 577, 575, 574, 578, 577, - 579, 580, 581, 583, 585, 584, 583, 586, - 585, 588, 587, 590, 589, 589, 591, 591, - 568, 593, 592, 594, 596, 595, 598, 597, - 597, 599, 599, 600, 345, 352, 602, 601, - 600, 603, 602, 604, 604, 606, 608, 609, - 607, 606, 610, 609, 612, 611, 614, 613, - 613, 615, 615, 616, 379, 219, 618, 617, - 616, 619, 618, 620, 620, 622, 623, 624, - 625, 626, 621, 621, 627, 628, 631, 629, - 632, 633, 630, 629, 634, 633, 635, 636, - 638, 639, 640, 641, 637, 637, 642, 656, - 651, 648, 643, 644, 643, 644, 645, 646, - 645, 647, 649, 652, 650, 649, 653, 652, - 654, 655, 657, 659, 660, 658, 657, 661, - 660, 663, 662, 665, 664, 664, 666, 666, - 667, 637, 644, 669, 668, 667, 670, 669, - 671, 671 + 73, 73, 79, 80, 83, 81, 84, 85, + 82, 81, 86, 85, 88, 89, 90, 91, + 92, 87, 87, 93, 94, 97, 95, 98, + 99, 96, 95, 100, 99, 102, 101, 104, + 103, 103, 105, 105, 106, 106, 107, 247, + 110, 277, 108, 107, 109, 110, 109, 110, + 111, 112, 111, 113, 114, 114, 115, 105, + 115, 116, 120, 119, 239, 117, 116, 118, + 119, 118, 119, 114, 121, 122, 123, 124, + 125, 120, 120, 126, 127, 130, 128, 131, + 132, 129, 128, 133, 132, 134, 135, 137, + 138, 139, 140, 136, 136, 244, 144, 141, + 142, 145, 143, 142, 146, 145, 236, 147, + 162, 147, 148, 162, 149, 149, 150, 151, + 152, 153, 154, 155, 150, 150, 156, 159, + 157, 160, 158, 157, 161, 160, 163, 164, + 163, 165, 166, 166, 167, 172, 167, 168, + 193, 171, 169, 168, 170, 171, 170, 171, + 166, 172, 173, 173, 174, 177, 162, 191, + 175, 174, 176, 176, 178, 179, 180, 181, + 182, 177, 177, 183, 184, 187, 185, 188, + 189, 186, 185, 190, 189, 192, 191, 194, + 195, 196, 197, 198, 193, 193, 199, 200, + 203, 201, 204, 205, 202, 201, 206, 205, + 207, 211, 207, 208, 212, 211, 209, 210, + 32, 213, 213, 214, 214, 215, 222, 218, + 216, 215, 217, 218, 217, 218, 219, 220, + 219, 221, 223, 224, 225, 226, 227, 222, + 222, 228, 229, 232, 230, 233, 234, 231, + 230, 235, 234, 237, 238, 243, 136, 240, + 239, 242, 241, 241, 238, 245, 246, 245, + 248, 249, 250, 251, 252, 247, 247, 253, + 254, 257, 255, 258, 259, 256, 255, 260, + 259, 261, 262, 264, 265, 266, 267, 263, + 263, 282, 271, 268, 269, 272, 270, 269, + 273, 272, 274, 275, 276, 281, 263, 278, + 277, 280, 279, 279, 276, 283, 284, 283 }; static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_actions[] = { @@ -3135,116 +1266,47 @@ static const char _tsip_machine_parser_header_P_Asserted_Identity_trans_actions[ 1, 16, 0, 0, 0, 16, 16, 7, 19, 13, 13, 3, 16, 0, 23, 5, 16, 0, 1, 0, 0, 0, 0, 0, - 16, 0, 0, 16, 0, 3, 13, 13, - 3, 13, 3, 13, 13, 13, 0, 0, - 3, 3, 0, 0, 0, 1, 0, 0, - 0, 5, 5, 5, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 5, 0, 16, 0, - 5, 0, 0, 0, 0, 0, 16, 0, - 0, 0, 0, 0, 0, 0, 16, 0, - 0, 16, 0, 13, 13, 13, 16, 0, - 16, 0, 0, 0, 0, 5, 0, 0, - 16, 16, 27, 13, 13, 3, 13, 16, - 0, 31, 5, 16, 0, 1, 16, 0, - 0, 0, 16, 16, 7, 27, 13, 13, - 3, 13, 16, 0, 31, 5, 16, 0, - 1, 0, 0, 0, 0, 0, 16, 0, - 0, 16, 0, 13, 13, 13, 16, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 0, 16, 0, 0, 16, 7, 0, 16, - 16, 7, 27, 13, 13, 3, 13, 16, - 0, 31, 5, 16, 0, 1, 0, 16, - 16, 27, 13, 13, 3, 13, 16, 0, - 31, 5, 16, 0, 1, 16, 0, 0, - 0, 16, 16, 27, 13, 13, 3, 13, - 16, 0, 31, 5, 16, 0, 1, 0, - 0, 0, 0, 0, 16, 0, 0, 16, - 0, 27, 13, 13, 13, 13, 13, 0, - 0, 0, 0, 0, 16, 0, 16, 0, - 13, 13, 13, 16, 0, 16, 0, 0, - 0, 0, 0, 0, 0, 16, 0, 16, - 0, 16, 31, 5, 16, 0, 1, 13, - 13, 13, 16, 0, 23, 5, 16, 16, - 0, 19, 13, 13, 3, 13, 16, 0, - 23, 16, 1, 16, 0, 0, 0, 16, - 16, 19, 13, 13, 3, 16, 0, 23, - 5, 16, 0, 1, 16, 0, 0, 0, - 0, 0, 16, 0, 0, 16, 0, 3, - 13, 13, 13, 3, 13, 0, 0, 3, - 0, 0, 0, 5, 0, 16, 0, 5, - 0, 0, 0, 0, 0, 3, 3, 13, - 0, 0, 3, 0, 0, 0, 5, 0, - 0, 16, 16, 19, 13, 13, 3, 16, - 0, 23, 5, 16, 0, 1, 16, 0, - 0, 0, 0, 0, 0, 0, 16, 0, - 0, 16, 0, 13, 13, 13, 16, 0, + 16, 0, 0, 16, 0, 13, 13, 13, 16, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 16, 0, 0, 16, 0, 13, - 13, 16, 0, 16, 0, 16, 0, 0, - 23, 16, 16, 19, 13, 0, 0, 0, - 0, 0, 16, 0, 16, 0, 13, 13, - 16, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 0, 16, 0, 16, 13, 13, + 0, 16, 0, 0, 16, 0, 13, 13, 13, 16, 0, 16, 0, 0, 0, 0, - 0, 0, 0, 16, 0, 0, 16, 0, - 16, 31, 5, 16, 0, 1, 16, 0, - 13, 13, 16, 0, 16, 0, 0, 16, - 13, 13, 13, 16, 0, 16, 0, 16, - 0, 0, 16, 13, 13, 13, 13, 16, - 0, 16, 13, 13, 16, 0, 16, 0, - 0, 16, 16, 0, 16, 0, 0, 31, - 16, 16, 27, 13, 0, 0, 0, 0, - 0, 16, 0, 16, 0, 13, 13, 16, - 0, 23, 5, 16, 16, 0, 19, 13, - 13, 3, 13, 16, 0, 23, 16, 1, - 16, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 0, 16, 0, 13, 13, 16, - 0, 16, 0, 0, 16, 0, 0, 23, - 16, 16, 19, 13, 0, 0, 0, 0, - 0, 16, 0, 16, 0, 19, 13, 13, - 13, 13, 0, 0, 0, 0, 0, 16, - 0, 16, 0, 13, 13, 16, 0, 16, - 0, 16, 0, 0, 23, 16, 16, 19, - 13, 0, 0, 0, 0, 0, 16, 0, - 16, 0, 13, 13, 16, 0, 16, 0, - 16, 0, 16, 0, 0, 16, 0, 0, - 16, 13, 0, 0, 0, 0, 0, 0, - 16, 0, 16, 27, 13, 13, 13, 13, - 0, 0, 0, 0, 0, 16, 0, 16, - 0, 13, 13, 16, 0, 16, 0, 0, - 0, 0, 0, 0, 0, 16, 0, 16, - 0, 16, 13, 13, 16, 0, 16, 0, - 0, 16, 13, 13, 16, 0, 16, 0, - 16, 0, 31, 16, 16, 0, 16, 0, - 0, 16, 16, 0, 0, 31, 16, 16, - 27, 13, 16, 0, 16, 0, 0, 16, - 13, 13, 16, 0, 16, 0, 0, 0, - 0, 0, 0, 16, 0, 0, 16, 0, - 13, 13, 13, 16, 0, 16, 0, 0, - 0, 0, 0, 0, 0, 16, 0, 16, - 0, 16, 13, 13, 16, 0, 16, 0, - 0, 16, 13, 13, 13, 16, 0, 16, - 0, 16, 0, 0, 31, 16, 16, 27, - 13, 16, 0, 0, 16, 0, 0, 31, - 16, 16, 27, 13, 13, 3, 13, 16, - 0, 16, 0, 31, 16, 13, 13, 13, - 16, 0, 16, 0, 16, 0, 0, 31, - 16, 16, 27, 13, 13, 3, 13, 16, - 0, 16, 0, 31, 16, 0, 0, 0, - 0, 0, 16, 0, 0, 16, 0, 13, - 13, 13, 16, 0, 16, 0, 0, 0, + 5, 0, 0, 16, 16, 27, 13, 13, + 3, 13, 16, 0, 31, 5, 16, 0, + 1, 16, 0, 0, 0, 16, 16, 7, + 27, 13, 13, 3, 13, 16, 0, 31, + 5, 16, 0, 1, 0, 0, 0, 0, + 0, 16, 0, 0, 16, 0, 13, 13, + 13, 16, 0, 16, 0, 0, 0, 0, + 0, 0, 0, 16, 0, 16, 0, 16, + 13, 13, 16, 0, 16, 0, 0, 23, + 5, 16, 0, 0, 16, 19, 13, 0, + 0, 0, 0, 0, 16, 0, 16, 0, + 13, 13, 16, 0, 16, 0, 1, 16, + 0, 0, 0, 16, 16, 7, 19, 13, + 13, 3, 16, 0, 23, 5, 16, 0, + 1, 16, 16, 19, 13, 13, 3, 13, + 16, 0, 23, 16, 0, 0, 0, 0, + 0, 16, 0, 0, 16, 0, 13, 13, + 13, 16, 0, 16, 0, 16, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, - 0, 16, 31, 5, 16, 0, 1, 16, - 0, 0, 13, 13, 16, 0, 16, 0, - 0, 16, 13, 13, 13, 16, 0, 16, - 0, 16, 0, 0, 31, 16, 16, 27, - 13, 13, 3, 13, 16, 0, 16, 0, - 31, 16 + 0, 13, 13, 13, 16, 0, 16, 0, + 5, 5, 0, 0, 0, 0, 0, 0, + 1, 0, 16, 16, 19, 13, 13, 3, + 16, 0, 23, 5, 16, 0, 1, 16, + 0, 0, 0, 0, 0, 0, 0, 16, + 0, 0, 16, 0, 13, 13, 13, 16, + 0, 16, 0, 16, 27, 13, 13, 16, + 0, 0, 31, 16, 16, 13, 16, 0, + 0, 0, 0, 0, 0, 16, 0, 0, + 16, 0, 13, 13, 13, 16, 0, 16, + 0, 0, 0, 0, 0, 0, 0, 16, + 0, 16, 0, 16, 13, 13, 16, 0, + 16, 0, 0, 16, 27, 13, 13, 16, + 0, 0, 31, 16, 16, 13, 16, 0 }; static const int tsip_machine_parser_header_P_Asserted_Identity_start = 1; -static const int tsip_machine_parser_header_P_Asserted_Identity_first_final = 672; +static const int tsip_machine_parser_header_P_Asserted_Identity_first_final = 285; static const int tsip_machine_parser_header_P_Asserted_Identity_error = 0; static const int tsip_machine_parser_header_P_Asserted_Identity_en_main = 1; @@ -3252,14 +1314,14 @@ static const int tsip_machine_parser_header_P_Asserted_Identity_en_main = 1; /* #line 141 "tsip_parser_header_P_Asserted_Identity.rl" */ -/* #line 3256 "../src/headers/tsip_header_P_Asserted_Identity.c" */ +/* #line 1318 "../src/headers/tsip_header_P_Asserted_Identity.c" */ { cs = tsip_machine_parser_header_P_Asserted_Identity_start; } /* #line 142 "tsip_parser_header_P_Asserted_Identity.rl" */ -/* #line 3263 "../src/headers/tsip_header_P_Asserted_Identity.c" */ +/* #line 1325 "../src/headers/tsip_header_P_Asserted_Identity.c" */ { int _klen; unsigned int _trans; @@ -3381,7 +1443,7 @@ _match: { } break; -/* #line 3385 "../src/headers/tsip_header_P_Asserted_Identity.c" */ +/* #line 1447 "../src/headers/tsip_header_P_Asserted_Identity.c" */ } } @@ -3397,8 +1459,8 @@ _again: /* #line 143 "tsip_parser_header_P_Asserted_Identity.rl" */ if( cs < -/* #line 3401 "../src/headers/tsip_header_P_Asserted_Identity.c" */ -672 +/* #line 1463 "../src/headers/tsip_header_P_Asserted_Identity.c" */ +285 /* #line 144 "tsip_parser_header_P_Asserted_Identity.rl" */ ) { diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Associated_URI.c b/trunk/tinySIP/src/headers/tsip_header_P_Associated_URI.c index 02972992..74030d0d 100644 --- a/trunk/tinySIP/src/headers/tsip_header_P_Associated_URI.c +++ b/trunk/tinySIP/src/headers/tsip_header_P_Associated_URI.c @@ -523,8 +523,6 @@ _again: // P_Associated_URI header object definition // -/**@ingroup tsip_header_P_Associated_URI_group -*/ static void* tsip_header_P_Associated_URI_create(void *self, va_list * app) { tsip_header_P_Associated_URI_t *P_Associated_URI = self; @@ -545,8 +543,6 @@ static void* tsip_header_P_Associated_URI_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_P_Associated_URI_group -*/ static void* tsip_header_P_Associated_URI_destroy(void *self) { tsip_header_P_Associated_URI_t *P_Associated_URI = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Charging_Function_Addresses.c b/trunk/tinySIP/src/headers/tsip_header_P_Charging_Function_Addresses.c index 0d48a5cc..a37a2103 100644 --- a/trunk/tinySIP/src/headers/tsip_header_P_Charging_Function_Addresses.c +++ b/trunk/tinySIP/src/headers/tsip_header_P_Charging_Function_Addresses.c @@ -731,8 +731,6 @@ _again: // P_Charging_Function_Addresses header object definition // -/**@ingroup tsip_header_P_Charging_Function_Addresses_group -*/ static void* tsip_header_P_Charging_Function_Addresses_create(void *self, va_list * app) { tsip_header_P_Charging_Function_Addresses_t *P_Charging_Function_Addresses = self; @@ -748,8 +746,6 @@ static void* tsip_header_P_Charging_Function_Addresses_create(void *self, va_lis return self; } -/**@ingroup tsip_header_P_Charging_Function_Addresses_group -*/ static void* tsip_header_P_Charging_Function_Addresses_destroy(void *self) { tsip_header_P_Charging_Function_Addresses_t *P_Charging_Function_Addresses = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Preferred_Identity.c b/trunk/tinySIP/src/headers/tsip_header_P_Preferred_Identity.c index 50068557..10bffb23 100644 --- a/trunk/tinySIP/src/headers/tsip_header_P_Preferred_Identity.c +++ b/trunk/tinySIP/src/headers/tsip_header_P_Preferred_Identity.c @@ -97,64 +97,47 @@ static const short _tsip_machine_parser_header_P_Preferred_Identity_key_offsets[ 255, 258, 258, 262, 282, 298, 315, 320, 328, 341, 346, 350, 355, 376, 393, 411, 417, 426, 445, 452, 459, 466, 473, 480, - 486, 525, 547, 549, 552, 574, 576, 579, - 583, 588, 606, 625, 630, 632, 635, 652, - 655, 658, 661, 664, 667, 669, 672, 677, - 684, 697, 701, 702, 738, 775, 784, 804, - 837, 857, 876, 894, 900, 906, 912, 918, - 924, 929, 967, 1002, 1038, 1046, 1065, 1077, - 1080, 1080, 1084, 1104, 1120, 1137, 1142, 1150, - 1163, 1168, 1172, 1177, 1198, 1215, 1233, 1239, - 1248, 1267, 1274, 1281, 1288, 1295, 1302, 1308, - 1347, 1369, 1371, 1374, 1396, 1409, 1413, 1414, - 1419, 1440, 1457, 1475, 1481, 1490, 1494, 1514, - 1530, 1547, 1552, 1560, 1573, 1578, 1582, 1587, - 1608, 1625, 1643, 1649, 1658, 1677, 1684, 1691, - 1698, 1705, 1712, 1718, 1757, 1779, 1781, 1784, - 1806, 1819, 1823, 1824, 1860, 1897, 1906, 1926, - 1959, 1979, 1998, 2016, 2022, 2028, 2034, 2040, - 2046, 2051, 2089, 2124, 2160, 2168, 2181, 2186, - 2190, 2210, 2228, 2234, 2240, 2246, 2252, 2258, - 2296, 2331, 2367, 2375, 2389, 2395, 2400, 2419, - 2426, 2433, 2440, 2447, 2454, 2460, 2499, 2535, - 2572, 2581, 2601, 2637, 2674, 2683, 2703, 2736, - 2756, 2775, 2780, 2801, 2818, 2836, 2842, 2851, - 2855, 2875, 2891, 2908, 2913, 2921, 2934, 2939, - 2943, 2948, 2969, 2986, 3004, 3010, 3019, 3038, - 3045, 3052, 3059, 3066, 3073, 3079, 3118, 3154, - 3191, 3200, 3220, 3253, 3273, 3292, 3299, 3318, - 3325, 3332, 3339, 3346, 3385, 3406, 3425, 3432, - 3439, 3446, 3453, 3460, 3499, 3535, 3572, 3581, - 3595, 3601, 3606, 3627, 3646, 3653, 3660, 3667, - 3674, 3681, 3720, 3741, 3760, 3767, 3774, 3781, - 3788, 3795, 3834, 3870, 3907, 3916, 3949, 3969, - 3988, 4002, 4008, 4013, 4034, 4053, 4060, 4067, - 4074, 4081, 4088, 4127, 4163, 4200, 4209, 4229, - 4265, 4302, 4311, 4347, 4384, 4393, 4426, 4446, - 4465, 4504, 4524, 4563, 4599, 4636, 4650, 4656, - 4661, 4682, 4700, 4706, 4712, 4718, 4724, 4730, - 4735, 4773, 4808, 4844, 4852, 4871, 4903, 4922, - 4940, 4946, 4964, 4970, 4976, 4982, 4988, 5026, - 5061, 5097, 5105, 5137, 5156, 5174, 5212, 5231, - 5269, 5304, 5340, 5353, 5358, 5362, 5382, 5396, - 5402, 5407, 5426, 5433, 5440, 5447, 5454, 5461, - 5467, 5506, 5542, 5579, 5588, 5608, 5641, 5661, - 5680, 5687, 5706, 5713, 5720, 5727, 5734, 5740, - 5746, 5755, 5769, 5775, 5814, 5835, 5849, 5855, - 5860, 5881, 5898, 5916, 5922, 5931, 5945, 5951, - 5970, 5977, 5984, 5991, 5998, 6005, 6011, 6050, - 6086, 6123, 6132, 6152, 6188, 6225, 6234, 6267, - 6287, 6306, 6345, 6365, 6404, 6440, 6477, 6491, - 6497, 6502, 6523, 6540, 6558, 6565, 6584, 6591, - 6598, 6605, 6612, 6618, 6624, 6633, 6672, 6708, - 6745, 6754, 6787, 6807, 6826, 6865, 6904, 6940, - 6977, 6997, 7011, 7017, 7022, 7043, 7060, 7078, - 7096, 7102, 7108, 7114, 7120, 7126, 7131, 7169, - 7204, 7240, 7248, 7267, 7299, 7318, 7336, 7342, - 7360, 7366, 7372, 7378, 7384, 7389, 7394, 7402, - 7415, 7420, 7424, 7462, 7497, 7533, 7541, 7573, - 7592, 7610, 7648, 7686, 7721, 7757, 7776, 7789, - 7794, 7798, 7818, 7834, 7851 + 486, 525, 561, 598, 607, 627, 645, 651, + 657, 663, 669, 675, 680, 718, 753, 789, + 797, 816, 828, 831, 831, 835, 855, 871, + 888, 893, 901, 914, 919, 923, 928, 949, + 966, 984, 990, 999, 1018, 1025, 1032, 1039, + 1046, 1053, 1059, 1098, 1134, 1171, 1180, 1200, + 1233, 1253, 1272, 1277, 1298, 1315, 1333, 1339, + 1348, 1352, 1372, 1388, 1405, 1410, 1418, 1431, + 1436, 1440, 1445, 1466, 1483, 1501, 1507, 1516, + 1535, 1542, 1549, 1556, 1563, 1570, 1576, 1615, + 1651, 1688, 1697, 1717, 1750, 1770, 1789, 1794, + 1815, 1832, 1850, 1856, 1865, 1879, 1885, 1904, + 1911, 1918, 1925, 1932, 1939, 1945, 1984, 2020, + 2057, 2066, 2086, 2119, 2139, 2158, 2165, 2184, + 2191, 2198, 2205, 2212, 2218, 2224, 2233, 2272, + 2308, 2345, 2354, 2387, 2407, 2446, 2467, 2484, + 2502, 2516, 2522, 2527, 2563, 2600, 2620, 2627, + 2646, 2653, 2660, 2667, 2674, 2713, 2749, 2786, + 2795, 2815, 2848, 2868, 2887, 2926, 2962, 2999, + 3038, 3059, 3079, 3093, 3099, 3104, 3122, 3128, + 3134, 3140, 3146, 3152, 3157, 3195, 3230, 3266, + 3274, 3293, 3325, 3344, 3362, 3368, 3386, 3392, + 3398, 3404, 3410, 3415, 3420, 3428, 3441, 3446, + 3450, 3488, 3523, 3559, 3567, 3599, 3618, 3656, + 3676, 3692, 3709, 3722, 3727, 3731, 3766, 3802, + 3821, 3835, 3841, 3846, 3865, 3872, 3879, 3886, + 3893, 3900, 3906, 3945, 3981, 4018, 4027, 4047, + 4080, 4100, 4119, 4126, 4145, 4152, 4159, 4166, + 4173, 4179, 4185, 4194, 4208, 4214, 4253, 4289, + 4326, 4335, 4368, 4388, 4427, 4448, 4465, 4483, + 4497, 4503, 4508, 4544, 4581, 4601, 4608, 4627, + 4634, 4641, 4648, 4655, 4661, 4667, 4676, 4715, + 4751, 4788, 4797, 4817, 4850, 4870, 4889, 4928, + 4964, 5001, 5021, 5060, 5081, 5098, 5116, 5152, + 5189, 5209, 5223, 5229, 5234, 5252, 5258, 5264, + 5270, 5276, 5282, 5287, 5325, 5360, 5396, 5404, + 5423, 5455, 5474, 5492, 5498, 5516, 5522, 5528, + 5534, 5540, 5545, 5550, 5558, 5571, 5576, 5580, + 5618, 5653, 5689, 5697, 5716, 5748, 5767, 5785, + 5823, 5858, 5894, 5913, 5951, 5971, 5987, 6004, + 6039, 6075, 6094, 6107, 6112, 6116 }; static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] = { @@ -224,168 +207,188 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 60, 62, 126, 42, - 43, 45, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 10, 62, 9, 32, 62, - 9, 13, 32, 33, 34, 37, 39, 60, - 62, 126, 42, 43, 45, 46, 48, 57, - 65, 90, 95, 96, 97, 122, 10, 62, - 9, 32, 62, 9, 32, 60, 62, 62, - 65, 90, 97, 122, 9, 13, 32, 33, - 37, 39, 62, 126, 42, 43, 45, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 33, 37, 39, 60, 62, 126, 42, - 43, 45, 46, 48, 57, 65, 90, 95, - 122, 9, 13, 32, 60, 62, 10, 62, - 9, 32, 62, 9, 13, 34, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 32, 126, 62, -128, -65, 62, - -128, -65, 62, -128, -65, 62, -128, -65, - 62, -128, -65, 10, 62, 9, 32, 62, - 9, 13, 32, 60, 62, 62, 0, 9, - 11, 12, 14, 127, 9, 32, 43, 58, - 62, 45, 46, 48, 57, 65, 90, 97, - 122, 9, 32, 58, 62, 62, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 44, 62, 0, 8, 11, 127, - 9, 13, 32, 34, 44, 60, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 34, - 44, 47, 58, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 42, 43, 57, 59, 64, 65, 90, 91, - 96, 97, 122, 123, 126, 9, 13, 32, - 34, 44, 58, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 34, 44, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 34, - 44, 92, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 33, 126, 9, 13, - 32, 44, -128, -65, 9, 13, 32, 44, - -128, -65, 9, 13, 32, 44, -128, -65, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, -128, -65, 9, 13, 32, 44, - 60, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 92, 126, -64, -33, + 33, 34, 37, 39, 44, 47, 62, 92, + 126, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 35, 41, 42, 57, 58, + 64, 65, 90, 91, 94, 95, 122, 123, + 125, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 122, 123, 125, 9, 13, - 32, 44, 0, 8, 11, 127, 9, 13, - 32, 34, 44, 60, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 32, 43, 58, 45, 46, 48, - 57, 65, 90, 97, 122, 9, 32, 58, - 9, 13, 32, 44, 9, 13, 32, 33, - 34, 37, 39, 44, 60, 126, 42, 46, - 48, 57, 65, 90, 95, 96, 97, 122, - 9, 13, 32, 33, 37, 39, 44, 126, - 42, 46, 48, 57, 65, 90, 95, 122, - 9, 13, 32, 33, 37, 39, 44, 60, - 126, 42, 46, 48, 57, 65, 90, 95, - 122, 9, 13, 32, 44, 60, 9, 13, - 32, 44, 65, 90, 97, 122, 9, 13, - 32, 44, 58, 43, 46, 48, 57, 65, - 90, 97, 122, 9, 13, 32, 44, 58, - 9, 13, 32, 44, 9, 13, 32, 44, - 62, 9, 13, 32, 33, 34, 37, 39, - 44, 60, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 96, 97, 122, 9, 13, - 32, 33, 37, 39, 44, 62, 126, 42, - 46, 48, 57, 65, 90, 95, 122, 9, - 13, 32, 33, 37, 39, 44, 60, 62, - 126, 42, 46, 48, 57, 65, 90, 95, - 122, 9, 13, 32, 44, 60, 62, 9, - 13, 32, 44, 62, 65, 90, 97, 122, - 9, 13, 32, 34, 44, 62, 92, -64, + 32, 44, 62, 0, 8, 11, 127, 9, + 13, 32, 34, 44, 60, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, + -3, 33, 126, 9, 13, 32, 34, 44, + 92, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 33, 126, 9, 13, 32, + 44, -128, -65, 9, 13, 32, 44, -128, + -65, 9, 13, 32, 44, -128, -65, 9, + 13, 32, 44, -128, -65, 9, 13, 32, + 44, -128, -65, 9, 13, 32, 44, 60, + 9, 13, 32, 33, 34, 37, 39, 44, + 47, 60, 92, 126, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 35, 41, + 42, 57, 58, 64, 65, 90, 91, 94, + 95, 96, 97, 122, 123, 125, 9, 13, + 32, 33, 34, 37, 39, 44, 47, 92, + 126, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 35, 41, 42, 57, 58, + 64, 65, 90, 91, 94, 95, 122, 123, + 125, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 60, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 122, 123, 125, 9, 13, 32, + 44, 0, 8, 11, 127, 9, 13, 32, + 34, 44, 60, 92, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 33, 126, + 9, 32, 43, 58, 45, 46, 48, 57, + 65, 90, 97, 122, 9, 32, 58, 9, + 13, 32, 44, 9, 13, 32, 33, 34, + 37, 39, 44, 60, 126, 42, 46, 48, + 57, 65, 90, 95, 96, 97, 122, 9, + 13, 32, 33, 37, 39, 44, 126, 42, + 46, 48, 57, 65, 90, 95, 122, 9, + 13, 32, 33, 37, 39, 44, 60, 126, + 42, 46, 48, 57, 65, 90, 95, 122, + 9, 13, 32, 44, 60, 9, 13, 32, + 44, 65, 90, 97, 122, 9, 13, 32, + 44, 58, 43, 46, 48, 57, 65, 90, + 97, 122, 9, 13, 32, 44, 58, 9, + 13, 32, 44, 9, 13, 32, 44, 62, + 9, 13, 32, 33, 34, 37, 39, 44, + 60, 62, 126, 42, 46, 48, 57, 65, + 90, 95, 96, 97, 122, 9, 13, 32, + 33, 37, 39, 44, 62, 126, 42, 46, + 48, 57, 65, 90, 95, 122, 9, 13, + 32, 33, 37, 39, 44, 60, 62, 126, + 42, 46, 48, 57, 65, 90, 95, 122, + 9, 13, 32, 44, 60, 62, 9, 13, + 32, 44, 62, 65, 90, 97, 122, 9, + 13, 32, 34, 44, 62, 92, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 33, 126, 9, 13, 32, 44, 62, -128, -65, 9, 13, 32, 44, 62, -128, -65, 9, 13, 32, 44, 62, -128, -65, 9, 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 60, 62, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 60, 62, 126, 42, 43, 45, - 46, 48, 57, 65, 90, 95, 96, 97, - 122, 10, 62, 9, 32, 62, 9, 13, - 32, 33, 34, 37, 39, 60, 62, 126, - 42, 43, 45, 46, 48, 57, 65, 90, - 95, 96, 97, 122, 9, 32, 43, 58, - 62, 45, 46, 48, 57, 65, 90, 97, - 122, 9, 32, 58, 62, 62, 9, 13, - 32, 44, 62, 9, 13, 32, 33, 34, - 37, 39, 44, 60, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 96, 97, 122, - 9, 13, 32, 33, 37, 39, 44, 62, - 126, 42, 46, 48, 57, 65, 90, 95, - 122, 9, 13, 32, 33, 37, 39, 44, - 60, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 44, 60, - 62, 9, 13, 32, 44, 62, 65, 90, - 97, 122, 9, 13, 32, 44, 9, 13, - 32, 33, 34, 37, 39, 44, 60, 126, - 42, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 33, 37, 39, - 44, 126, 42, 46, 48, 57, 65, 90, - 95, 122, 9, 13, 32, 33, 37, 39, - 44, 60, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 44, 60, - 9, 13, 32, 44, 65, 90, 97, 122, - 9, 13, 32, 44, 58, 43, 46, 48, - 57, 65, 90, 97, 122, 9, 13, 32, - 44, 58, 9, 13, 32, 44, 9, 13, - 32, 44, 62, 9, 13, 32, 33, 34, - 37, 39, 44, 60, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 96, 97, 122, - 9, 13, 32, 33, 37, 39, 44, 62, - 126, 42, 46, 48, 57, 65, 90, 95, - 122, 9, 13, 32, 33, 37, 39, 44, - 60, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 44, 60, - 62, 9, 13, 32, 44, 62, 65, 90, - 97, 122, 9, 13, 32, 34, 44, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 60, 62, 9, 13, + 32, 44, 62, -128, -65, 9, 13, 32, + 44, 60, 62, 9, 13, 32, 33, 34, + 37, 39, 44, 47, 60, 62, 92, 126, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 96, 97, 122, + 123, 125, 9, 13, 32, 33, 34, 37, + 39, 44, 47, 62, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 122, 123, 125, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 60, 62, 126, 42, - 43, 45, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 10, 62, 9, 32, 62, - 9, 13, 32, 33, 34, 37, 39, 60, - 62, 126, 42, 43, 45, 46, 48, 57, - 65, 90, 95, 96, 97, 122, 9, 32, - 43, 58, 62, 45, 46, 48, 57, 65, - 90, 97, 122, 9, 32, 58, 62, 62, + 122, 123, 125, 9, 13, 32, 44, 62, + 0, 8, 11, 127, 9, 13, 32, 34, + 44, 60, 62, 92, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 33, 126, + 9, 13, 32, 34, 44, 47, 58, 62, + 92, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 33, 42, 43, 57, 59, + 64, 65, 90, 91, 96, 97, 122, 123, + 126, 9, 13, 32, 34, 44, 58, 62, + 92, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 33, 126, 9, 13, 32, + 34, 44, 62, 92, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 33, 126, + 9, 13, 32, 44, 62, 9, 13, 32, + 33, 34, 37, 39, 44, 60, 62, 126, + 42, 46, 48, 57, 65, 90, 95, 96, + 97, 122, 9, 13, 32, 33, 37, 39, + 44, 62, 126, 42, 46, 48, 57, 65, + 90, 95, 122, 9, 13, 32, 33, 37, + 39, 44, 60, 62, 126, 42, 46, 48, + 57, 65, 90, 95, 122, 9, 13, 32, + 44, 60, 62, 9, 13, 32, 44, 62, + 65, 90, 97, 122, 9, 13, 32, 44, + 9, 13, 32, 33, 34, 37, 39, 44, + 60, 126, 42, 46, 48, 57, 65, 90, + 95, 96, 97, 122, 9, 13, 32, 33, + 37, 39, 44, 126, 42, 46, 48, 57, + 65, 90, 95, 122, 9, 13, 32, 33, + 37, 39, 44, 60, 126, 42, 46, 48, + 57, 65, 90, 95, 122, 9, 13, 32, + 44, 60, 9, 13, 32, 44, 65, 90, + 97, 122, 9, 13, 32, 44, 58, 43, + 46, 48, 57, 65, 90, 97, 122, 9, + 13, 32, 44, 58, 9, 13, 32, 44, + 9, 13, 32, 44, 62, 9, 13, 32, + 33, 34, 37, 39, 44, 60, 62, 126, + 42, 46, 48, 57, 65, 90, 95, 96, + 97, 122, 9, 13, 32, 33, 37, 39, + 44, 62, 126, 42, 46, 48, 57, 65, + 90, 95, 122, 9, 13, 32, 33, 37, + 39, 44, 60, 62, 126, 42, 46, 48, + 57, 65, 90, 95, 122, 9, 13, 32, + 44, 60, 62, 9, 13, 32, 44, 62, + 65, 90, 97, 122, 9, 13, 32, 34, + 44, 62, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, + 13, 32, 44, 62, -128, -65, 9, 13, + 32, 44, 62, -128, -65, 9, 13, 32, + 44, 62, -128, -65, 9, 13, 32, 44, + 62, -128, -65, 9, 13, 32, 44, 62, + -128, -65, 9, 13, 32, 44, 60, 62, + 9, 13, 32, 33, 34, 37, 39, 44, + 47, 60, 62, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 96, 97, 122, 123, 125, 9, + 13, 32, 33, 34, 37, 39, 44, 47, + 62, 92, 126, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 35, 41, 42, + 57, 58, 64, 65, 90, 91, 94, 95, + 122, 123, 125, 9, 13, 32, 33, 34, + 37, 39, 44, 47, 60, 62, 92, 126, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 122, 123, 125, + 9, 13, 32, 44, 62, 0, 8, 11, + 127, 9, 13, 32, 34, 44, 60, 62, + 92, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 33, 126, 9, 13, 32, + 34, 44, 47, 58, 62, 92, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 33, 42, 43, 57, 59, 64, 65, 90, + 91, 96, 97, 122, 123, 126, 9, 13, + 32, 34, 44, 58, 62, 92, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 33, 126, 9, 13, 32, 34, 44, 62, + 92, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 33, 126, 9, 13, 32, + 44, 62, 9, 13, 32, 33, 34, 37, + 39, 44, 60, 62, 126, 42, 46, 48, + 57, 65, 90, 95, 96, 97, 122, 9, + 13, 32, 33, 37, 39, 44, 62, 126, + 42, 46, 48, 57, 65, 90, 95, 122, + 9, 13, 32, 33, 37, 39, 44, 60, + 62, 126, 42, 46, 48, 57, 65, 90, + 95, 122, 9, 13, 32, 44, 60, 62, + 9, 13, 32, 44, 62, 65, 90, 97, + 122, 9, 13, 32, 44, 58, 62, 43, + 46, 48, 57, 65, 90, 97, 122, 9, + 13, 32, 44, 58, 62, 9, 13, 32, + 34, 44, 62, 92, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 33, 126, + 9, 13, 32, 44, 62, -128, -65, 9, + 13, 32, 44, 62, -128, -65, 9, 13, + 32, 44, 62, -128, -65, 9, 13, 32, + 44, 62, -128, -65, 9, 13, 32, 44, + 62, -128, -65, 9, 13, 32, 44, 60, + 62, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 60, 62, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 96, 97, 122, 123, 125, 9, 13, 32, 33, 34, 37, 39, 44, 47, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, @@ -408,82 +411,76 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] -3, 33, 126, 9, 13, 32, 34, 44, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, - 32, 34, 44, 92, -64, -33, -32, -17, + 32, 44, 62, -128, -65, 9, 13, 32, + 34, 44, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, -128, -65, 9, 13, 32, 44, - -128, -65, 9, 13, 32, 44, -128, -65, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, 60, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 44, 0, 8, 11, 127, - 9, 13, 32, 44, 58, 43, 46, 48, - 57, 65, 90, 97, 122, 9, 13, 32, - 44, 58, 9, 13, 32, 44, 9, 13, - 32, 33, 34, 37, 39, 44, 60, 126, - 42, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 34, 44, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 44, - -128, -65, 9, 13, 32, 44, -128, -65, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, -128, -65, 9, 13, 32, 44, - -128, -65, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 92, 126, -64, -33, + 9, 13, 32, 44, 62, -128, -65, 9, + 13, 32, 44, 62, -128, -65, 9, 13, + 32, 44, 62, -128, -65, 9, 13, 32, + 44, 62, -128, -65, 9, 13, 32, 44, + 60, 62, 9, 13, 32, 44, 60, 62, + 9, 13, 32, 44, 62, 65, 90, 97, + 122, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 96, 97, 122, 123, 125, 9, 13, 32, 33, 34, 37, 39, 44, - 47, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 44, 0, 8, 11, 127, 9, - 13, 32, 44, 58, 62, 43, 46, 48, - 57, 65, 90, 97, 122, 9, 13, 32, - 44, 58, 62, 9, 13, 32, 44, 62, - 9, 13, 32, 34, 44, 62, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 60, 62, 9, 13, 32, 33, + 47, 62, 92, 126, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 35, 41, + 42, 57, 58, 64, 65, 90, 91, 94, + 95, 122, 123, 125, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, + 64, 65, 90, 91, 94, 95, 122, 123, + 125, 9, 13, 32, 44, 62, 0, 8, + 11, 127, 9, 13, 32, 34, 44, 47, + 58, 62, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 42, 43, + 57, 59, 64, 65, 90, 91, 96, 97, + 122, 123, 126, 9, 13, 32, 34, 44, + 58, 62, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 44, - 62, 0, 8, 11, 127, 9, 13, 32, - 34, 44, 60, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 33, 34, 37, 39, + 95, 96, 97, 122, 123, 125, 9, 13, + 32, 33, 34, 37, 39, 44, 60, 62, + 126, 42, 46, 48, 57, 65, 90, 95, + 96, 97, 122, 9, 13, 32, 33, 37, + 39, 44, 62, 126, 42, 46, 48, 57, + 65, 90, 95, 122, 9, 13, 32, 33, + 37, 39, 44, 60, 62, 126, 42, 46, + 48, 57, 65, 90, 95, 122, 9, 13, + 32, 44, 58, 62, 43, 46, 48, 57, + 65, 90, 97, 122, 9, 13, 32, 44, + 58, 62, 9, 13, 32, 44, 62, 9, + 13, 32, 33, 34, 37, 39, 44, 47, + 62, 92, 126, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 35, 41, 42, + 57, 58, 64, 65, 90, 91, 94, 95, + 122, 123, 125, 9, 13, 32, 33, 34, + 37, 39, 44, 47, 60, 62, 92, 126, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 122, 123, 125, + 9, 13, 32, 34, 44, 60, 62, 92, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 33, 126, 9, 13, 32, 44, + 62, -128, -65, 9, 13, 32, 34, 44, + 62, 92, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 33, 126, 9, 13, + 32, 44, 62, -128, -65, 9, 13, 32, + 44, 62, -128, -65, 9, 13, 32, 44, + 62, -128, -65, 9, 13, 32, 44, 62, + -128, -65, 9, 13, 32, 33, 34, 37, + 39, 44, 47, 60, 62, 92, 126, -64, + -33, -32, -17, -16, -9, -8, -5, -4, + -3, 35, 41, 42, 57, 58, 64, 65, + 90, 91, 94, 95, 96, 97, 122, 123, + 125, 9, 13, 32, 33, 34, 37, 39, 44, 47, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, @@ -505,44 +502,6 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] -4, -3, 33, 126, 9, 13, 32, 34, 44, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, - 13, 32, 44, 62, 9, 13, 32, 33, - 34, 37, 39, 44, 60, 62, 126, 42, - 46, 48, 57, 65, 90, 95, 96, 97, - 122, 9, 13, 32, 33, 37, 39, 44, - 62, 126, 42, 46, 48, 57, 65, 90, - 95, 122, 9, 13, 32, 33, 37, 39, - 44, 60, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 44, - 60, 62, 9, 13, 32, 44, 62, 65, - 90, 97, 122, 9, 13, 32, 44, 9, - 13, 32, 33, 34, 37, 39, 44, 60, - 126, 42, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 9, 13, 32, 33, 37, - 39, 44, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 9, 13, 32, 33, 37, - 39, 44, 60, 126, 42, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 44, - 60, 9, 13, 32, 44, 65, 90, 97, - 122, 9, 13, 32, 44, 58, 43, 46, - 48, 57, 65, 90, 97, 122, 9, 13, - 32, 44, 58, 9, 13, 32, 44, 9, - 13, 32, 44, 62, 9, 13, 32, 33, - 34, 37, 39, 44, 60, 62, 126, 42, - 46, 48, 57, 65, 90, 95, 96, 97, - 122, 9, 13, 32, 33, 37, 39, 44, - 62, 126, 42, 46, 48, 57, 65, 90, - 95, 122, 9, 13, 32, 33, 37, 39, - 44, 60, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 44, - 60, 62, 9, 13, 32, 44, 62, 65, - 90, 97, 122, 9, 13, 32, 34, 44, - 62, 92, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 33, 126, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 60, 62, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, @@ -557,40 +516,216 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 44, 62, 0, 8, 11, 127, - 9, 13, 32, 34, 44, 60, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 34, - 44, 47, 58, 62, 92, -64, -33, -32, + 13, 32, 33, 34, 37, 39, 44, 47, + 60, 62, 92, 126, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 35, 41, + 42, 57, 58, 64, 65, 90, 91, 94, + 95, 96, 97, 122, 123, 125, 9, 13, + 32, 33, 34, 37, 39, 44, 60, 62, + 126, 42, 46, 48, 57, 65, 90, 95, + 96, 97, 122, 9, 13, 32, 34, 44, + 60, 62, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, + 13, 32, 44, 58, 62, 43, 46, 48, + 57, 65, 90, 97, 122, 9, 13, 32, + 44, 58, 62, 9, 13, 32, 44, 62, + 9, 13, 32, 34, 44, 92, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 33, 126, 9, 13, 32, 44, -128, -65, + 9, 13, 32, 44, -128, -65, 9, 13, + 32, 44, -128, -65, 9, 13, 32, 44, + -128, -65, 9, 13, 32, 44, -128, -65, + 9, 13, 32, 44, 60, 9, 13, 32, + 33, 34, 37, 39, 44, 47, 60, 92, + 126, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 35, 41, 42, 57, 58, + 64, 65, 90, 91, 94, 95, 96, 97, + 122, 123, 125, 9, 13, 32, 33, 34, + 37, 39, 44, 47, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 122, 123, 125, 9, 13, + 32, 33, 34, 37, 39, 44, 47, 60, + 92, 126, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 35, 41, 42, 57, + 58, 64, 65, 90, 91, 94, 95, 122, + 123, 125, 9, 13, 32, 44, 0, 8, + 11, 127, 9, 13, 32, 34, 44, 60, + 92, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 33, 126, 9, 13, 32, + 34, 44, 47, 58, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 42, 43, 57, 59, 64, 65, 90, 91, 96, 97, 122, 123, 126, 9, 13, 32, - 34, 44, 58, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 34, 44, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 34, 44, - 62, 92, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 33, 126, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, + 34, 44, 58, 92, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 33, 126, + 9, 13, 32, 34, 44, 92, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 33, 126, 9, 13, 32, 44, -128, -65, + 9, 13, 32, 34, 44, 92, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 33, 126, 9, 13, 32, 44, -128, -65, + 9, 13, 32, 44, -128, -65, 9, 13, + 32, 44, -128, -65, 9, 13, 32, 44, + -128, -65, 9, 13, 32, 44, 60, 9, + 13, 32, 44, 60, 9, 13, 32, 44, + 65, 90, 97, 122, 9, 13, 32, 44, + 58, 43, 46, 48, 57, 65, 90, 97, + 122, 9, 13, 32, 44, 58, 9, 13, + 32, 44, 9, 13, 32, 33, 34, 37, + 39, 44, 47, 60, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 96, 97, 122, 123, 125, + 9, 13, 32, 33, 34, 37, 39, 44, + 47, 92, 126, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 35, 41, 42, + 57, 58, 64, 65, 90, 91, 94, 95, + 122, 123, 125, 9, 13, 32, 33, 34, + 37, 39, 44, 47, 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 60, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 96, 97, 122, 9, 13, + 90, 91, 94, 95, 122, 123, 125, 9, + 13, 32, 44, 0, 8, 11, 127, 9, + 13, 32, 34, 44, 47, 58, 92, -64, + -33, -32, -17, -16, -9, -8, -5, -4, + -3, 33, 42, 43, 57, 59, 64, 65, + 90, 91, 96, 97, 122, 123, 126, 9, + 13, 32, 34, 44, 58, 92, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 33, 126, 9, 13, 32, 33, 34, 37, + 39, 44, 47, 60, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 96, 97, 122, 123, 125, + 9, 13, 32, 33, 34, 37, 39, 44, + 60, 126, 42, 46, 48, 57, 65, 90, + 95, 96, 97, 122, 9, 13, 32, 33, + 37, 39, 44, 126, 42, 46, 48, 57, + 65, 90, 95, 122, 9, 13, 32, 33, + 37, 39, 44, 60, 126, 42, 46, 48, + 57, 65, 90, 95, 122, 9, 13, 32, + 44, 58, 43, 46, 48, 57, 65, 90, + 97, 122, 9, 13, 32, 44, 58, 9, + 13, 32, 44, 9, 13, 32, 33, 34, + 37, 39, 44, 47, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 122, 123, 125, 9, 13, + 32, 33, 34, 37, 39, 44, 47, 60, + 92, 126, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 35, 41, 42, 57, + 58, 64, 65, 90, 91, 94, 95, 122, + 123, 125, 9, 13, 32, 34, 44, 60, + 92, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 33, 126, 9, 13, 32, + 44, 58, 62, 43, 46, 48, 57, 65, + 90, 97, 122, 9, 13, 32, 44, 58, + 62, 9, 13, 32, 44, 62, 9, 13, 32, 34, 44, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, 32, 44, 62, -128, -65, 9, 13, 32, 44, 62, -128, -65, 9, 13, 32, 44, 62, -128, -65, 9, 13, 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 33, + 44, 62, -128, -65, 9, 13, 32, 44, + 60, 62, 9, 13, 32, 33, 34, 37, + 39, 44, 47, 60, 62, 92, 126, -64, + -33, -32, -17, -16, -9, -8, -5, -4, + -3, 35, 41, 42, 57, 58, 64, 65, + 90, 91, 94, 95, 96, 97, 122, 123, + 125, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 62, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 122, 123, 125, 9, 13, 32, + 33, 34, 37, 39, 44, 47, 60, 62, + 92, 126, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 35, 41, 42, 57, + 58, 64, 65, 90, 91, 94, 95, 122, + 123, 125, 9, 13, 32, 44, 62, 0, + 8, 11, 127, 9, 13, 32, 34, 44, + 60, 62, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, + 13, 32, 34, 44, 47, 58, 62, 92, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 33, 42, 43, 57, 59, 64, + 65, 90, 91, 96, 97, 122, 123, 126, + 9, 13, 32, 34, 44, 58, 62, 92, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 33, 126, 9, 13, 32, 34, + 44, 62, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, + 13, 32, 44, 62, -128, -65, 9, 13, + 32, 34, 44, 62, 92, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 33, + 126, 9, 13, 32, 44, 62, -128, -65, + 9, 13, 32, 44, 62, -128, -65, 9, + 13, 32, 44, 62, -128, -65, 9, 13, + 32, 44, 62, -128, -65, 9, 13, 32, + 44, 60, 62, 9, 13, 32, 44, 60, + 62, 9, 13, 32, 44, 62, 65, 90, + 97, 122, 9, 13, 32, 44, 58, 62, + 43, 46, 48, 57, 65, 90, 97, 122, + 9, 13, 32, 44, 58, 62, 9, 13, + 32, 33, 34, 37, 39, 44, 47, 60, + 62, 92, 126, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 35, 41, 42, + 57, 58, 64, 65, 90, 91, 94, 95, + 96, 97, 122, 123, 125, 9, 13, 32, + 33, 34, 37, 39, 44, 47, 62, 92, + 126, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 35, 41, 42, 57, 58, + 64, 65, 90, 91, 94, 95, 122, 123, + 125, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 60, 62, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 122, 123, 125, 9, 13, + 32, 44, 62, 0, 8, 11, 127, 9, + 13, 32, 34, 44, 47, 58, 62, 92, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 33, 42, 43, 57, 59, 64, + 65, 90, 91, 96, 97, 122, 123, 126, + 9, 13, 32, 34, 44, 58, 62, 92, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 33, 126, 9, 13, 32, 33, + 34, 37, 39, 44, 47, 60, 62, 92, + 126, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 35, 41, 42, 57, 58, + 64, 65, 90, 91, 94, 95, 96, 97, + 122, 123, 125, 9, 13, 32, 33, 34, + 37, 39, 44, 60, 62, 126, 42, 46, + 48, 57, 65, 90, 95, 96, 97, 122, + 9, 13, 32, 33, 37, 39, 44, 62, + 126, 42, 46, 48, 57, 65, 90, 95, + 122, 9, 13, 32, 33, 37, 39, 44, + 60, 62, 126, 42, 46, 48, 57, 65, + 90, 95, 122, 9, 13, 32, 44, 58, + 62, 43, 46, 48, 57, 65, 90, 97, + 122, 9, 13, 32, 44, 58, 62, 9, + 13, 32, 44, 62, 9, 13, 32, 33, + 34, 37, 39, 44, 47, 62, 92, 126, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 122, 123, 125, + 9, 13, 32, 33, 34, 37, 39, 44, + 47, 60, 62, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 122, 123, 125, 9, 13, 32, + 34, 44, 60, 62, 92, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 33, + 126, 9, 13, 32, 44, 62, -128, -65, + 9, 13, 32, 34, 44, 62, 92, -64, + -33, -32, -17, -16, -9, -8, -5, -4, + -3, 33, 126, 9, 13, 32, 44, 62, + -128, -65, 9, 13, 32, 44, 62, -128, + -65, 9, 13, 32, 44, 62, -128, -65, + 9, 13, 32, 44, 62, -128, -65, 9, + 13, 32, 44, 60, 62, 9, 13, 32, + 44, 60, 62, 9, 13, 32, 44, 62, + 65, 90, 97, 122, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, @@ -606,108 +741,9 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] 42, 57, 58, 64, 65, 90, 91, 94, 95, 122, 123, 125, 9, 13, 32, 44, 62, 0, 8, 11, 127, 9, 13, 32, - 44, 58, 62, 43, 46, 48, 57, 65, - 90, 97, 122, 9, 13, 32, 44, 58, - 62, 9, 13, 32, 44, 62, 9, 13, - 32, 33, 34, 37, 39, 44, 60, 62, - 126, 42, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 9, 13, 32, 34, 44, - 62, 92, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 33, 126, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 60, 62, 126, 42, 46, 48, 57, 65, - 90, 95, 96, 97, 122, 9, 13, 32, - 34, 44, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 44, 62, - 0, 8, 11, 127, 9, 13, 32, 34, - 44, 47, 58, 62, 92, -64, -33, -32, + 34, 44, 60, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, - 42, 43, 57, 59, 64, 65, 90, 91, - 96, 97, 122, 123, 126, 9, 13, 32, - 34, 44, 58, 62, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 126, 9, 13, 32, 34, 44, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 44, - 58, 62, 43, 46, 48, 57, 65, 90, - 97, 122, 9, 13, 32, 44, 58, 62, - 9, 13, 32, 44, 62, 9, 13, 32, - 33, 34, 37, 39, 44, 60, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 34, 44, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 62, -128, -65, 9, 13, 32, 44, 62, - -128, -65, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 96, 97, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 44, 62, 0, 8, 11, - 127, 9, 13, 32, 34, 44, 60, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 44, 62, 0, 8, 11, 127, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 44, 62, 0, 8, 11, - 127, 9, 13, 32, 34, 44, 47, 58, + 126, 9, 13, 32, 34, 44, 47, 58, 62, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 42, 43, 57, 59, 64, 65, 90, 91, 96, 97, 122, @@ -721,29 +757,45 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 34, 44, 60, 62, 92, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 33, 126, 9, 13, 32, 33, + 9, 13, 32, 33, 34, 37, 39, 44, + 47, 62, 92, 126, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 35, 41, + 42, 57, 58, 64, 65, 90, 91, 94, + 95, 122, 123, 125, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 62, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 96, 97, - 122, 123, 125, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 122, 123, 125, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 44, - 58, 62, 43, 46, 48, 57, 65, 90, - 97, 122, 9, 13, 32, 44, 58, 62, - 9, 13, 32, 44, 62, 9, 13, 32, - 33, 34, 37, 39, 44, 60, 62, 126, - 42, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 34, 44, 92, + 64, 65, 90, 91, 94, 95, 122, 123, + 125, 9, 13, 32, 34, 44, 60, 62, + 92, -64, -33, -32, -17, -16, -9, -8, + -5, -4, -3, 33, 126, 9, 13, 32, + 33, 34, 37, 39, 44, 47, 60, 62, + 92, 126, -64, -33, -32, -17, -16, -9, + -8, -5, -4, -3, 35, 41, 42, 57, + 58, 64, 65, 90, 91, 94, 95, 96, + 97, 122, 123, 125, 9, 13, 32, 33, + 34, 37, 39, 44, 60, 62, 126, 42, + 46, 48, 57, 65, 90, 95, 96, 97, + 122, 9, 13, 32, 33, 37, 39, 44, + 62, 126, 42, 46, 48, 57, 65, 90, + 95, 122, 9, 13, 32, 33, 37, 39, + 44, 60, 62, 126, 42, 46, 48, 57, + 65, 90, 95, 122, 9, 13, 32, 33, + 34, 37, 39, 44, 47, 62, 92, 126, + -64, -33, -32, -17, -16, -9, -8, -5, + -4, -3, 35, 41, 42, 57, 58, 64, + 65, 90, 91, 94, 95, 122, 123, 125, + 9, 13, 32, 33, 34, 37, 39, 44, + 47, 60, 62, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 122, 123, 125, 9, 13, 32, + 34, 44, 60, 62, 92, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 33, + 126, 9, 13, 32, 44, 58, 62, 43, + 46, 48, 57, 65, 90, 97, 122, 9, + 13, 32, 44, 58, 62, 9, 13, 32, + 44, 62, 9, 13, 32, 34, 44, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, 32, 44, -128, -65, 9, 13, 32, 44, -128, -65, @@ -781,7 +833,12 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] -4, -3, 33, 126, 9, 13, 32, 44, -128, -65, 9, 13, 32, 44, -128, -65, 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, -128, -65, 9, 13, 32, 33, + 32, 44, -128, -65, 9, 13, 32, 44, + 60, 9, 13, 32, 44, 60, 9, 13, + 32, 44, 65, 90, 97, 122, 9, 13, + 32, 44, 58, 43, 46, 48, 57, 65, + 90, 97, 122, 9, 13, 32, 44, 58, + 9, 13, 32, 44, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, @@ -796,350 +853,59 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_keys[] -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, 122, 123, 125, 9, 13, 32, 44, 0, 8, 11, - 127, 9, 13, 32, 34, 44, 47, 58, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 42, 43, 57, 59, - 64, 65, 90, 91, 96, 97, 122, 123, - 126, 9, 13, 32, 34, 44, 58, 92, + 127, 9, 13, 32, 34, 44, 60, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, 32, 34, - 44, 92, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 33, 126, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, + 44, 47, 58, 92, -64, -33, -32, -17, + -16, -9, -8, -5, -4, -3, 33, 42, + 43, 57, 59, 64, 65, 90, 91, 96, + 97, 122, 123, 126, 9, 13, 32, 34, + 44, 58, 92, -64, -33, -32, -17, -16, + -9, -8, -5, -4, -3, 33, 126, 9, + 13, 32, 34, 44, 92, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 33, + 126, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 60, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 96, 97, 122, 123, 125, 9, + 13, 32, 33, 34, 37, 39, 44, 47, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 96, - 97, 122, 123, 125, 9, 13, 32, 34, - 44, 60, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 126, 9, + 58, 64, 65, 90, 91, 94, 95, 122, + 123, 125, 9, 13, 32, 33, 34, 37, + 39, 44, 47, 60, 92, 126, -64, -33, + -32, -17, -16, -9, -8, -5, -4, -3, + 35, 41, 42, 57, 58, 64, 65, 90, + 91, 94, 95, 122, 123, 125, 9, 13, + 32, 34, 44, 60, 92, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 33, + 126, 9, 13, 32, 33, 34, 37, 39, + 44, 47, 60, 92, 126, -64, -33, -32, + -17, -16, -9, -8, -5, -4, -3, 35, + 41, 42, 57, 58, 64, 65, 90, 91, + 94, 95, 96, 97, 122, 123, 125, 9, + 13, 32, 33, 34, 37, 39, 44, 60, + 126, 42, 46, 48, 57, 65, 90, 95, + 96, 97, 122, 9, 13, 32, 33, 37, + 39, 44, 126, 42, 46, 48, 57, 65, + 90, 95, 122, 9, 13, 32, 33, 37, + 39, 44, 60, 126, 42, 46, 48, 57, + 65, 90, 95, 122, 9, 13, 32, 33, + 34, 37, 39, 44, 47, 92, 126, -64, + -33, -32, -17, -16, -9, -8, -5, -4, + -3, 35, 41, 42, 57, 58, 64, 65, + 90, 91, 94, 95, 122, 123, 125, 9, 13, 32, 33, 34, 37, 39, 44, 47, 60, 92, 126, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 35, 41, 42, 57, 58, 64, 65, 90, 91, 94, 95, - 96, 97, 122, 123, 125, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 44, - 58, 43, 46, 48, 57, 65, 90, 97, - 122, 9, 13, 32, 44, 58, 9, 13, - 32, 44, 9, 13, 32, 33, 34, 37, - 39, 44, 60, 126, 42, 46, 48, 57, - 65, 90, 95, 96, 97, 122, 9, 13, - 32, 44, 58, 62, 43, 46, 48, 57, - 65, 90, 97, 122, 9, 13, 32, 44, - 58, 62, 9, 13, 32, 44, 62, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 60, 62, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 44, 62, - 0, 8, 11, 127, 9, 13, 32, 34, - 44, 60, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 34, 44, 47, 58, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 42, 43, 57, 59, - 64, 65, 90, 91, 96, 97, 122, 123, - 126, 9, 13, 32, 34, 44, 58, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 34, 44, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 60, 62, 9, 13, 32, 44, - 60, 62, 9, 13, 32, 44, 62, 65, - 90, 97, 122, 9, 13, 32, 44, 58, - 62, 43, 46, 48, 57, 65, 90, 97, - 122, 9, 13, 32, 44, 58, 62, 9, - 13, 32, 33, 34, 37, 39, 44, 47, - 60, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 60, 62, - 126, 42, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 9, 13, 32, 44, 58, - 62, 43, 46, 48, 57, 65, 90, 97, - 122, 9, 13, 32, 44, 58, 62, 9, - 13, 32, 44, 62, 9, 13, 32, 33, - 34, 37, 39, 44, 60, 62, 126, 42, - 46, 48, 57, 65, 90, 95, 96, 97, - 122, 9, 13, 32, 33, 37, 39, 44, - 62, 126, 42, 46, 48, 57, 65, 90, - 95, 122, 9, 13, 32, 33, 37, 39, - 44, 60, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 44, - 60, 62, 9, 13, 32, 44, 62, 65, - 90, 97, 122, 9, 13, 32, 44, 58, - 62, 43, 46, 48, 57, 65, 90, 97, - 122, 9, 13, 32, 44, 58, 62, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 44, 62, -128, - -65, 9, 13, 32, 44, 62, -128, -65, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 60, 62, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 96, 97, 122, - 123, 125, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 60, - 62, 92, 126, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 35, 41, 42, - 57, 58, 64, 65, 90, 91, 94, 95, - 122, 123, 125, 9, 13, 32, 44, 62, - 0, 8, 11, 127, 9, 13, 32, 34, - 44, 60, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 44, 62, 0, 8, - 11, 127, 9, 13, 32, 34, 44, 47, - 58, 62, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 42, 43, - 57, 59, 64, 65, 90, 91, 96, 97, - 122, 123, 126, 9, 13, 32, 34, 44, - 58, 62, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 126, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 34, 44, 60, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 33, 34, 37, 39, 44, 47, 60, 62, - 92, 126, -64, -33, -32, -17, -16, -9, - -8, -5, -4, -3, 35, 41, 42, 57, - 58, 64, 65, 90, 91, 94, 95, 96, - 97, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 62, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 62, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 44, 58, 62, 43, 46, 48, 57, 65, - 90, 97, 122, 9, 13, 32, 44, 58, - 62, 9, 13, 32, 44, 62, 9, 13, - 32, 33, 34, 37, 39, 44, 60, 62, - 126, 42, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 9, 13, 32, 33, 37, - 39, 44, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 33, - 37, 39, 44, 60, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 34, 44, 62, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, 62, -128, -65, 9, - 13, 32, 44, 62, -128, -65, 9, 13, - 32, 44, 62, -128, -65, 9, 13, 32, - 44, 62, -128, -65, 9, 13, 32, 44, - 60, 62, 9, 13, 32, 44, 60, 62, - 9, 13, 32, 44, 62, 65, 90, 97, - 122, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 44, 62, 0, 8, - 11, 127, 9, 13, 32, 34, 44, 47, - 58, 62, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 42, 43, - 57, 59, 64, 65, 90, 91, 96, 97, - 122, 123, 126, 9, 13, 32, 34, 44, - 58, 62, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 126, 9, - 13, 32, 34, 44, 62, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 62, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 62, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 62, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 62, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 34, 44, 60, 62, - 92, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 33, 126, 9, 13, 32, - 44, 58, 62, 43, 46, 48, 57, 65, - 90, 97, 122, 9, 13, 32, 44, 58, - 62, 9, 13, 32, 44, 62, 9, 13, - 32, 33, 34, 37, 39, 44, 60, 62, - 126, 42, 46, 48, 57, 65, 90, 95, - 96, 97, 122, 9, 13, 32, 33, 37, - 39, 44, 62, 126, 42, 46, 48, 57, - 65, 90, 95, 122, 9, 13, 32, 33, - 37, 39, 44, 60, 62, 126, 42, 46, - 48, 57, 65, 90, 95, 122, 9, 13, - 32, 34, 44, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, -128, -65, 9, 13, 32, 44, - -128, -65, 9, 13, 32, 44, -128, -65, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, 60, 9, 13, 32, 33, 34, - 37, 39, 44, 47, 60, 92, 126, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 35, 41, 42, 57, 58, 64, 65, - 90, 91, 94, 95, 96, 97, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 122, 123, 125, 9, 13, 32, 33, - 34, 37, 39, 44, 47, 60, 92, 126, - -64, -33, -32, -17, -16, -9, -8, -5, - -4, -3, 35, 41, 42, 57, 58, 64, - 65, 90, 91, 94, 95, 122, 123, 125, - 9, 13, 32, 44, 0, 8, 11, 127, - 9, 13, 32, 34, 44, 60, 92, -64, - -33, -32, -17, -16, -9, -8, -5, -4, - -3, 33, 126, 9, 13, 32, 34, 44, - 47, 58, 92, -64, -33, -32, -17, -16, - -9, -8, -5, -4, -3, 33, 42, 43, - 57, 59, 64, 65, 90, 91, 96, 97, - 122, 123, 126, 9, 13, 32, 34, 44, - 58, 92, -64, -33, -32, -17, -16, -9, + 122, 123, 125, 9, 13, 32, 34, 44, + 60, 92, -64, -33, -32, -17, -16, -9, -8, -5, -4, -3, 33, 126, 9, 13, - 32, 34, 44, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 34, 44, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, -128, -65, 9, 13, - 32, 44, -128, -65, 9, 13, 32, 44, - -128, -65, 9, 13, 32, 44, -128, -65, - 9, 13, 32, 44, 60, 9, 13, 32, - 44, 60, 9, 13, 32, 44, 65, 90, - 97, 122, 9, 13, 32, 44, 58, 43, - 46, 48, 57, 65, 90, 97, 122, 9, - 13, 32, 44, 58, 9, 13, 32, 44, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 44, 0, 8, 11, 127, 9, 13, 32, - 34, 44, 47, 58, 92, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 33, - 42, 43, 57, 59, 64, 65, 90, 91, - 96, 97, 122, 123, 126, 9, 13, 32, - 34, 44, 58, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 34, 44, 92, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 33, 126, 9, 13, 32, 33, 34, 37, - 39, 44, 47, 60, 92, 126, -64, -33, - -32, -17, -16, -9, -8, -5, -4, -3, - 35, 41, 42, 57, 58, 64, 65, 90, - 91, 94, 95, 96, 97, 122, 123, 125, - 9, 13, 32, 33, 34, 37, 39, 44, - 47, 60, 92, 126, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 35, 41, - 42, 57, 58, 64, 65, 90, 91, 94, - 95, 96, 97, 122, 123, 125, 9, 13, - 32, 33, 34, 37, 39, 44, 47, 92, - 126, -64, -33, -32, -17, -16, -9, -8, - -5, -4, -3, 35, 41, 42, 57, 58, - 64, 65, 90, 91, 94, 95, 122, 123, - 125, 9, 13, 32, 33, 34, 37, 39, - 44, 47, 60, 92, 126, -64, -33, -32, - -17, -16, -9, -8, -5, -4, -3, 35, - 41, 42, 57, 58, 64, 65, 90, 91, - 94, 95, 122, 123, 125, 9, 13, 32, - 34, 44, 60, 92, -64, -33, -32, -17, - -16, -9, -8, -5, -4, -3, 33, 126, - 9, 13, 32, 44, 58, 43, 46, 48, - 57, 65, 90, 97, 122, 9, 13, 32, - 44, 58, 9, 13, 32, 44, 9, 13, - 32, 33, 34, 37, 39, 44, 60, 126, - 42, 46, 48, 57, 65, 90, 95, 96, - 97, 122, 9, 13, 32, 33, 37, 39, - 44, 126, 42, 46, 48, 57, 65, 90, - 95, 122, 9, 13, 32, 33, 37, 39, - 44, 60, 126, 42, 46, 48, 57, 65, - 90, 95, 122, 0 + 32, 44, 58, 43, 46, 48, 57, 65, + 90, 97, 122, 9, 13, 32, 44, 58, + 9, 13, 32, 44, 0 }; static const char _tsip_machine_parser_header_P_Preferred_Identity_single_lengths[] = { @@ -1153,64 +919,47 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_single_length 3, 0, 4, 10, 8, 9, 5, 4, 5, 5, 4, 5, 11, 9, 10, 6, 5, 7, 5, 5, 5, 5, 5, 6, - 13, 10, 2, 3, 10, 2, 3, 4, - 1, 8, 9, 5, 2, 3, 5, 1, - 1, 1, 1, 1, 2, 3, 5, 1, - 5, 4, 1, 12, 13, 5, 8, 9, - 8, 7, 6, 4, 4, 4, 4, 4, - 5, 12, 11, 12, 4, 7, 4, 3, - 0, 4, 10, 8, 9, 5, 4, 5, - 5, 4, 5, 11, 9, 10, 6, 5, - 7, 5, 5, 5, 5, 5, 6, 13, - 10, 2, 3, 10, 5, 4, 1, 5, - 11, 9, 10, 6, 5, 4, 10, 8, - 9, 5, 4, 5, 5, 4, 5, 11, - 9, 10, 6, 5, 7, 5, 5, 5, - 5, 5, 6, 13, 10, 2, 3, 10, - 5, 4, 1, 12, 13, 5, 8, 9, - 8, 7, 6, 4, 4, 4, 4, 4, - 5, 12, 11, 12, 4, 5, 5, 4, - 10, 6, 4, 4, 4, 4, 4, 12, - 11, 12, 4, 6, 6, 5, 7, 5, - 5, 5, 5, 5, 6, 13, 12, 13, - 5, 8, 12, 13, 5, 8, 9, 8, - 7, 5, 11, 9, 10, 6, 5, 4, - 10, 8, 9, 5, 4, 5, 5, 4, - 5, 11, 9, 10, 6, 5, 7, 5, + 13, 12, 13, 5, 8, 6, 4, 4, + 4, 4, 4, 5, 12, 11, 12, 4, + 7, 4, 3, 0, 4, 10, 8, 9, + 5, 4, 5, 5, 4, 5, 11, 9, + 10, 6, 5, 7, 5, 5, 5, 5, + 5, 6, 13, 12, 13, 5, 8, 9, + 8, 7, 5, 11, 9, 10, 6, 5, + 4, 10, 8, 9, 5, 4, 5, 5, + 4, 5, 11, 9, 10, 6, 5, 7, + 5, 5, 5, 5, 5, 6, 13, 12, + 13, 5, 8, 9, 8, 7, 5, 11, + 9, 10, 6, 5, 6, 6, 7, 5, 5, 5, 5, 5, 6, 13, 12, 13, 5, 8, 9, 8, 7, 5, 7, 5, - 5, 5, 5, 13, 11, 7, 5, 5, - 5, 5, 5, 13, 12, 13, 5, 6, - 6, 5, 11, 7, 5, 5, 5, 5, - 5, 13, 11, 7, 5, 5, 5, 5, - 5, 13, 12, 13, 5, 9, 8, 7, - 6, 6, 5, 11, 7, 5, 5, 5, - 5, 5, 13, 12, 13, 5, 8, 12, - 13, 5, 12, 13, 5, 9, 8, 7, - 13, 8, 13, 12, 13, 6, 6, 5, - 11, 6, 4, 4, 4, 4, 4, 5, - 12, 11, 12, 4, 7, 8, 7, 6, - 4, 6, 4, 4, 4, 4, 12, 11, - 12, 4, 8, 7, 6, 12, 7, 12, - 11, 12, 5, 5, 4, 10, 6, 6, - 5, 7, 5, 5, 5, 5, 5, 6, - 13, 12, 13, 5, 8, 9, 8, 7, - 5, 7, 5, 5, 5, 5, 6, 6, - 5, 6, 6, 13, 11, 6, 6, 5, - 11, 9, 10, 6, 5, 6, 6, 7, - 5, 5, 5, 5, 5, 6, 13, 12, - 13, 5, 8, 12, 13, 5, 9, 8, - 7, 13, 8, 13, 12, 13, 6, 6, - 5, 11, 9, 10, 5, 7, 5, 5, - 5, 5, 6, 6, 5, 13, 12, 13, - 5, 9, 8, 7, 13, 13, 12, 13, - 8, 6, 6, 5, 11, 9, 10, 6, - 4, 4, 4, 4, 4, 5, 12, 11, - 12, 4, 7, 8, 7, 6, 4, 6, - 4, 4, 4, 4, 5, 5, 4, 5, - 5, 4, 12, 11, 12, 4, 8, 7, - 6, 12, 12, 11, 12, 7, 5, 5, - 4, 10, 8, 9, 0 + 5, 5, 5, 6, 6, 5, 13, 12, + 13, 5, 9, 8, 13, 11, 9, 10, + 6, 6, 5, 12, 13, 8, 5, 7, + 5, 5, 5, 5, 13, 12, 13, 5, + 8, 9, 8, 7, 13, 12, 13, 13, + 11, 8, 6, 6, 5, 6, 4, 4, + 4, 4, 4, 5, 12, 11, 12, 4, + 7, 8, 7, 6, 4, 6, 4, 4, + 4, 4, 5, 5, 4, 5, 5, 4, + 12, 11, 12, 4, 8, 7, 12, 10, + 8, 9, 5, 5, 4, 11, 12, 7, + 6, 6, 5, 7, 5, 5, 5, 5, + 5, 6, 13, 12, 13, 5, 8, 9, + 8, 7, 5, 7, 5, 5, 5, 5, + 6, 6, 5, 6, 6, 13, 12, 13, + 5, 9, 8, 13, 11, 9, 10, 6, + 6, 5, 12, 13, 8, 5, 7, 5, + 5, 5, 5, 6, 6, 5, 13, 12, + 13, 5, 8, 9, 8, 7, 13, 12, + 13, 8, 13, 11, 9, 10, 12, 13, + 8, 6, 6, 5, 6, 4, 4, 4, + 4, 4, 5, 12, 11, 12, 4, 7, + 8, 7, 6, 4, 6, 4, 4, 4, + 4, 5, 5, 4, 5, 5, 4, 12, + 11, 12, 4, 7, 8, 7, 6, 12, + 11, 12, 7, 12, 10, 8, 9, 11, + 12, 7, 5, 5, 4, 0 }; static const char _tsip_machine_parser_header_P_Preferred_Identity_range_lengths[] = { @@ -1224,64 +973,47 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_range_lengths 0, 0, 0, 5, 4, 4, 0, 2, 4, 0, 0, 0, 5, 4, 4, 0, 2, 6, 1, 1, 1, 1, 1, 0, - 13, 6, 0, 0, 6, 0, 0, 0, - 2, 5, 5, 0, 0, 0, 6, 1, - 1, 1, 1, 1, 0, 0, 0, 3, - 4, 0, 0, 12, 12, 2, 6, 12, - 6, 6, 6, 1, 1, 1, 1, 1, - 0, 13, 12, 12, 2, 6, 4, 0, - 0, 0, 5, 4, 4, 0, 2, 4, - 0, 0, 0, 5, 4, 4, 0, 2, - 6, 1, 1, 1, 1, 1, 0, 13, - 6, 0, 0, 6, 4, 0, 0, 0, - 5, 4, 4, 0, 2, 0, 5, 4, - 4, 0, 2, 4, 0, 0, 0, 5, - 4, 4, 0, 2, 6, 1, 1, 1, - 1, 1, 0, 13, 6, 0, 0, 6, - 4, 0, 0, 12, 12, 2, 6, 12, - 6, 6, 6, 1, 1, 1, 1, 1, - 0, 13, 12, 12, 2, 4, 0, 0, - 5, 6, 1, 1, 1, 1, 1, 13, - 12, 12, 2, 4, 0, 0, 6, 1, - 1, 1, 1, 1, 0, 13, 12, 12, - 2, 6, 12, 12, 2, 6, 12, 6, - 6, 0, 5, 4, 4, 0, 2, 0, - 5, 4, 4, 0, 2, 4, 0, 0, - 0, 5, 4, 4, 0, 2, 6, 1, + 13, 12, 12, 2, 6, 6, 1, 1, + 1, 1, 1, 0, 13, 12, 12, 2, + 6, 4, 0, 0, 0, 5, 4, 4, + 0, 2, 4, 0, 0, 0, 5, 4, + 4, 0, 2, 6, 1, 1, 1, 1, + 1, 0, 13, 12, 12, 2, 6, 12, + 6, 6, 0, 5, 4, 4, 0, 2, + 0, 5, 4, 4, 0, 2, 4, 0, + 0, 0, 5, 4, 4, 0, 2, 6, + 1, 1, 1, 1, 1, 0, 13, 12, + 12, 2, 6, 12, 6, 6, 0, 5, + 4, 4, 0, 2, 4, 0, 6, 1, 1, 1, 1, 1, 0, 13, 12, 12, 2, 6, 12, 6, 6, 1, 6, 1, - 1, 1, 1, 13, 5, 6, 1, 1, - 1, 1, 1, 13, 12, 12, 2, 4, - 0, 0, 5, 6, 1, 1, 1, 1, - 1, 13, 5, 6, 1, 1, 1, 1, - 1, 13, 12, 12, 2, 12, 6, 6, - 4, 0, 0, 5, 6, 1, 1, 1, - 1, 1, 13, 12, 12, 2, 6, 12, - 12, 2, 12, 12, 2, 12, 6, 6, - 13, 6, 13, 12, 12, 4, 0, 0, - 5, 6, 1, 1, 1, 1, 1, 0, - 13, 12, 12, 2, 6, 12, 6, 6, - 1, 6, 1, 1, 1, 1, 13, 12, - 12, 2, 12, 6, 6, 13, 6, 13, - 12, 12, 4, 0, 0, 5, 4, 0, - 0, 6, 1, 1, 1, 1, 1, 0, - 13, 12, 12, 2, 6, 12, 6, 6, - 1, 6, 1, 1, 1, 1, 0, 0, - 2, 4, 0, 13, 5, 4, 0, 0, - 5, 4, 4, 0, 2, 4, 0, 6, - 1, 1, 1, 1, 1, 0, 13, 12, - 12, 2, 6, 12, 12, 2, 12, 6, - 6, 13, 6, 13, 12, 12, 4, 0, - 0, 5, 4, 4, 1, 6, 1, 1, - 1, 1, 0, 0, 2, 13, 12, 12, - 2, 12, 6, 6, 13, 13, 12, 12, - 6, 4, 0, 0, 5, 4, 4, 6, - 1, 1, 1, 1, 1, 0, 13, 12, - 12, 2, 6, 12, 6, 6, 1, 6, - 1, 1, 1, 1, 0, 0, 2, 4, - 0, 0, 13, 12, 12, 2, 12, 6, - 6, 13, 13, 12, 12, 6, 4, 0, - 0, 5, 4, 4, 0 + 1, 1, 1, 0, 0, 2, 13, 12, + 12, 2, 12, 6, 13, 5, 4, 4, + 4, 0, 0, 12, 12, 6, 1, 6, + 1, 1, 1, 1, 13, 12, 12, 2, + 6, 12, 6, 6, 13, 12, 12, 13, + 5, 6, 4, 0, 0, 6, 1, 1, + 1, 1, 1, 0, 13, 12, 12, 2, + 6, 12, 6, 6, 1, 6, 1, 1, + 1, 1, 0, 0, 2, 4, 0, 0, + 13, 12, 12, 2, 12, 6, 13, 5, + 4, 4, 4, 0, 0, 12, 12, 6, + 4, 0, 0, 6, 1, 1, 1, 1, + 1, 0, 13, 12, 12, 2, 6, 12, + 6, 6, 1, 6, 1, 1, 1, 1, + 0, 0, 2, 4, 0, 13, 12, 12, + 2, 12, 6, 13, 5, 4, 4, 4, + 0, 0, 12, 12, 6, 1, 6, 1, + 1, 1, 1, 0, 0, 2, 13, 12, + 12, 2, 6, 12, 6, 6, 13, 12, + 12, 6, 13, 5, 4, 4, 12, 12, + 6, 4, 0, 0, 6, 1, 1, 1, + 1, 1, 0, 13, 12, 12, 2, 6, + 12, 6, 6, 1, 6, 1, 1, 1, + 1, 0, 0, 2, 4, 0, 0, 13, + 12, 12, 2, 6, 12, 6, 6, 13, + 12, 12, 6, 13, 5, 4, 4, 12, + 12, 6, 4, 0, 0, 0 }; static const short _tsip_machine_parser_header_P_Preferred_Identity_index_offsets[] = { @@ -1295,64 +1027,47 @@ static const short _tsip_machine_parser_header_P_Preferred_Identity_index_offset 252, 256, 257, 262, 278, 291, 305, 311, 318, 328, 334, 339, 345, 362, 376, 391, 398, 406, 420, 427, 434, 441, 448, 455, - 462, 489, 506, 509, 513, 530, 533, 537, - 542, 546, 560, 575, 581, 584, 588, 600, - 603, 606, 609, 612, 615, 618, 622, 628, - 633, 643, 648, 650, 675, 701, 709, 724, - 746, 761, 775, 788, 794, 800, 806, 812, - 818, 824, 850, 874, 899, 906, 920, 929, - 933, 934, 939, 955, 968, 982, 988, 995, - 1005, 1011, 1016, 1022, 1039, 1053, 1068, 1075, - 1083, 1097, 1104, 1111, 1118, 1125, 1132, 1139, - 1166, 1183, 1186, 1190, 1207, 1217, 1222, 1224, - 1230, 1247, 1261, 1276, 1283, 1291, 1296, 1312, - 1325, 1339, 1345, 1352, 1362, 1368, 1373, 1379, - 1396, 1410, 1425, 1432, 1440, 1454, 1461, 1468, - 1475, 1482, 1489, 1496, 1523, 1540, 1543, 1547, - 1564, 1574, 1579, 1581, 1606, 1632, 1640, 1655, - 1677, 1692, 1706, 1719, 1725, 1731, 1737, 1743, - 1749, 1755, 1781, 1805, 1830, 1837, 1847, 1853, - 1858, 1874, 1887, 1893, 1899, 1905, 1911, 1917, - 1943, 1967, 1992, 1999, 2010, 2017, 2023, 2037, - 2044, 2051, 2058, 2065, 2072, 2079, 2106, 2131, - 2157, 2165, 2180, 2205, 2231, 2239, 2254, 2276, - 2291, 2305, 2311, 2328, 2342, 2357, 2364, 2372, - 2377, 2393, 2406, 2420, 2426, 2433, 2443, 2449, - 2454, 2460, 2477, 2491, 2506, 2513, 2521, 2535, - 2542, 2549, 2556, 2563, 2570, 2577, 2604, 2629, - 2655, 2663, 2678, 2700, 2715, 2729, 2736, 2750, - 2757, 2764, 2771, 2778, 2805, 2822, 2836, 2843, - 2850, 2857, 2864, 2871, 2898, 2923, 2949, 2957, - 2968, 2975, 2981, 2998, 3012, 3019, 3026, 3033, - 3040, 3047, 3074, 3091, 3105, 3112, 3119, 3126, - 3133, 3140, 3167, 3192, 3218, 3226, 3248, 3263, - 3277, 3288, 3295, 3301, 3318, 3332, 3339, 3346, - 3353, 3360, 3367, 3394, 3419, 3445, 3453, 3468, - 3493, 3519, 3527, 3552, 3578, 3586, 3608, 3623, - 3637, 3664, 3679, 3706, 3731, 3757, 3768, 3775, - 3781, 3798, 3811, 3817, 3823, 3829, 3835, 3841, - 3847, 3873, 3897, 3922, 3929, 3943, 3964, 3978, - 3991, 3997, 4010, 4016, 4022, 4028, 4034, 4060, - 4084, 4109, 4116, 4137, 4151, 4164, 4190, 4204, - 4230, 4254, 4279, 4289, 4295, 4300, 4316, 4327, - 4334, 4340, 4354, 4361, 4368, 4375, 4382, 4389, - 4396, 4423, 4448, 4474, 4482, 4497, 4519, 4534, - 4548, 4555, 4569, 4576, 4583, 4590, 4597, 4604, - 4611, 4619, 4630, 4637, 4664, 4681, 4692, 4699, - 4705, 4722, 4736, 4751, 4758, 4766, 4777, 4784, - 4798, 4805, 4812, 4819, 4826, 4833, 4840, 4867, - 4892, 4918, 4926, 4941, 4966, 4992, 5000, 5022, - 5037, 5051, 5078, 5093, 5120, 5145, 5171, 5182, - 5189, 5195, 5212, 5226, 5241, 5248, 5262, 5269, - 5276, 5283, 5290, 5297, 5304, 5312, 5339, 5364, - 5390, 5398, 5420, 5435, 5449, 5476, 5503, 5528, - 5554, 5569, 5580, 5587, 5593, 5610, 5624, 5639, - 5652, 5658, 5664, 5670, 5676, 5682, 5688, 5714, - 5738, 5763, 5770, 5784, 5805, 5819, 5832, 5838, - 5851, 5857, 5863, 5869, 5875, 5881, 5887, 5894, - 5904, 5910, 5915, 5941, 5965, 5990, 5997, 6018, - 6032, 6045, 6071, 6097, 6121, 6146, 6160, 6170, - 6176, 6181, 6197, 6210, 6224 + 462, 489, 514, 540, 548, 563, 576, 582, + 588, 594, 600, 606, 612, 638, 662, 687, + 694, 708, 717, 721, 722, 727, 743, 756, + 770, 776, 783, 793, 799, 804, 810, 827, + 841, 856, 863, 871, 885, 892, 899, 906, + 913, 920, 927, 954, 979, 1005, 1013, 1028, + 1050, 1065, 1079, 1085, 1102, 1116, 1131, 1138, + 1146, 1151, 1167, 1180, 1194, 1200, 1207, 1217, + 1223, 1228, 1234, 1251, 1265, 1280, 1287, 1295, + 1309, 1316, 1323, 1330, 1337, 1344, 1351, 1378, + 1403, 1429, 1437, 1452, 1474, 1489, 1503, 1509, + 1526, 1540, 1555, 1562, 1570, 1581, 1588, 1602, + 1609, 1616, 1623, 1630, 1637, 1644, 1671, 1696, + 1722, 1730, 1745, 1767, 1782, 1796, 1803, 1817, + 1824, 1831, 1838, 1845, 1852, 1859, 1867, 1894, + 1919, 1945, 1953, 1975, 1990, 2017, 2034, 2048, + 2063, 2074, 2081, 2087, 2112, 2138, 2153, 2160, + 2174, 2181, 2188, 2195, 2202, 2229, 2254, 2280, + 2288, 2303, 2325, 2340, 2354, 2381, 2406, 2432, + 2459, 2476, 2491, 2502, 2509, 2515, 2528, 2534, + 2540, 2546, 2552, 2558, 2564, 2590, 2614, 2639, + 2646, 2660, 2681, 2695, 2708, 2714, 2727, 2733, + 2739, 2745, 2751, 2757, 2763, 2770, 2780, 2786, + 2791, 2817, 2841, 2866, 2873, 2894, 2908, 2934, + 2950, 2963, 2977, 2987, 2993, 2998, 3022, 3047, + 3061, 3072, 3079, 3085, 3099, 3106, 3113, 3120, + 3127, 3134, 3141, 3168, 3193, 3219, 3227, 3242, + 3264, 3279, 3293, 3300, 3314, 3321, 3328, 3335, + 3342, 3349, 3356, 3364, 3375, 3382, 3409, 3434, + 3460, 3468, 3490, 3505, 3532, 3549, 3563, 3578, + 3589, 3596, 3602, 3627, 3653, 3668, 3675, 3689, + 3696, 3703, 3710, 3717, 3724, 3731, 3739, 3766, + 3791, 3817, 3825, 3840, 3862, 3877, 3891, 3918, + 3943, 3969, 3984, 4011, 4028, 4042, 4057, 4082, + 4108, 4123, 4134, 4141, 4147, 4160, 4166, 4172, + 4178, 4184, 4190, 4196, 4222, 4246, 4271, 4278, + 4292, 4313, 4327, 4340, 4346, 4359, 4365, 4371, + 4377, 4383, 4389, 4395, 4402, 4412, 4418, 4423, + 4449, 4473, 4498, 4505, 4519, 4540, 4554, 4567, + 4593, 4617, 4642, 4656, 4682, 4698, 4711, 4725, + 4749, 4774, 4788, 4798, 4804, 4809 }; static const short _tsip_machine_parser_header_P_Preferred_Identity_indicies[] = { @@ -1407,827 +1122,628 @@ static const short _tsip_machine_parser_header_P_Preferred_Identity_indicies[] = 68, 92, 92, 92, 92, 92, 84, 95, 69, 95, 86, 89, 68, 84, 85, 69, 85, 86, 68, 90, 90, 84, 101, 69, - 101, 103, 104, 37, 105, 96, 97, 98, + 101, 103, 104, 68, 105, 96, 97, 98, 99, 100, 102, 84, 85, 69, 85, 86, 68, 102, 84, 85, 69, 85, 86, 68, 96, 84, 85, 69, 85, 86, 68, 97, 84, 85, 69, 85, 86, 68, 98, 84, 85, 69, 85, 86, 68, 99, 84, 93, - 69, 93, 86, 94, 68, 84, 106, 69, - 106, 107, 108, 107, 107, 104, 102, 109, - 37, 105, 107, 96, 97, 98, 99, 100, - 102, 107, 102, 110, 102, 107, 110, 102, - 84, 106, 111, 106, 112, 113, 112, 112, - 109, 37, 112, 112, 112, 112, 114, 112, - 114, 36, 115, 37, 36, 116, 116, 37, - 36, 116, 117, 116, 112, 113, 112, 112, - 109, 37, 112, 112, 112, 112, 114, 112, - 114, 36, 118, 37, 36, 119, 119, 37, - 36, 119, 119, 109, 37, 36, 37, 120, - 120, 36, 121, 122, 121, 123, 123, 123, - 37, 123, 123, 123, 123, 123, 123, 36, - 124, 125, 124, 123, 123, 123, 126, 37, - 123, 123, 123, 123, 123, 123, 36, 127, - 117, 127, 109, 37, 36, 128, 37, 36, - 121, 121, 37, 36, 134, 135, 136, 37, - 137, 129, 130, 131, 132, 133, 134, 36, - 37, 134, 36, 37, 129, 36, 37, 130, - 36, 37, 131, 36, 37, 132, 36, 138, - 37, 36, 134, 134, 37, 36, 124, 125, - 124, 126, 37, 36, 37, 134, 134, 134, - 36, 139, 139, 140, 141, 37, 140, 140, - 140, 140, 36, 139, 139, 141, 37, 36, - 68, 84, 142, 69, 142, 143, 103, 143, - 143, 104, 102, 37, 105, 143, 96, 97, - 98, 99, 100, 102, 143, 102, 143, 102, - 143, 102, 84, 49, 69, 49, 143, 103, - 143, 143, 104, 102, 51, 37, 105, 143, - 96, 97, 98, 99, 100, 102, 143, 102, - 143, 102, 143, 102, 84, 101, 69, 101, - 104, 68, 102, 102, 84, 49, 69, 49, - 103, 104, 51, 37, 105, 96, 97, 98, - 99, 100, 102, 84, 144, 69, 144, 103, - 104, 102, 146, 37, 105, 96, 97, 98, - 99, 100, 102, 145, 102, 145, 102, 145, - 102, 84, 144, 69, 144, 103, 104, 146, - 37, 105, 96, 97, 98, 99, 100, 102, - 84, 101, 69, 101, 103, 104, 68, 105, - 96, 97, 98, 99, 100, 102, 84, 152, - 69, 152, 154, 155, 156, 147, 148, 149, - 150, 151, 153, 67, 68, 69, 68, 70, - 153, 67, 68, 69, 68, 70, 147, 67, - 68, 69, 68, 70, 148, 67, 68, 69, - 68, 70, 149, 67, 68, 69, 68, 70, - 150, 67, 77, 69, 77, 70, 78, 67, - 40, 69, 40, 157, 158, 157, 157, 155, - 153, 25, 156, 157, 147, 148, 149, 150, - 151, 153, 157, 153, 72, 153, 157, 72, - 153, 67, 159, 69, 159, 160, 154, 160, - 160, 155, 153, 156, 160, 147, 148, 149, - 150, 151, 153, 160, 153, 160, 153, 160, - 153, 67, 49, 69, 49, 160, 154, 160, - 160, 155, 153, 51, 156, 160, 147, 148, - 149, 150, 151, 153, 160, 153, 160, 153, - 160, 153, 67, 152, 69, 152, 155, 153, - 153, 67, 49, 69, 49, 154, 155, 51, - 156, 147, 148, 149, 150, 151, 153, 67, - 161, 161, 162, 163, 162, 162, 162, 162, - 1, 161, 161, 163, 1, 164, 165, 69, - 165, 166, 164, 166, 69, 166, 167, 168, - 167, 167, 166, 169, 167, 167, 167, 170, - 167, 170, 164, 171, 69, 171, 172, 172, - 172, 166, 172, 172, 172, 172, 172, 164, - 173, 69, 173, 172, 172, 172, 166, 174, - 172, 172, 172, 172, 172, 164, 175, 69, - 175, 166, 169, 164, 165, 69, 165, 166, - 176, 176, 164, 177, 69, 177, 166, 179, - 178, 178, 178, 178, 164, 177, 69, 177, - 166, 179, 164, 181, 69, 181, 182, 180, - 181, 69, 181, 182, 165, 180, 182, 69, - 182, 183, 184, 183, 183, 182, 185, 165, - 183, 183, 183, 186, 183, 186, 180, 187, - 69, 187, 188, 188, 188, 182, 165, 188, - 188, 188, 188, 188, 180, 189, 69, 189, - 188, 188, 188, 182, 190, 165, 188, 188, - 188, 188, 188, 180, 191, 69, 191, 182, - 185, 165, 180, 181, 69, 181, 182, 165, - 192, 192, 180, 198, 69, 198, 200, 201, - 37, 202, 193, 194, 195, 196, 197, 199, - 180, 181, 69, 181, 182, 165, 199, 180, - 181, 69, 181, 182, 165, 193, 180, 181, - 69, 181, 182, 165, 194, 180, 181, 69, - 181, 182, 165, 195, 180, 181, 69, 181, - 182, 165, 196, 180, 189, 69, 189, 182, - 190, 165, 180, 203, 69, 203, 204, 205, - 204, 204, 201, 199, 109, 37, 202, 204, - 193, 194, 195, 196, 197, 199, 204, 199, - 206, 199, 204, 206, 199, 180, 203, 207, - 203, 112, 113, 112, 112, 109, 37, 112, - 112, 112, 112, 208, 112, 208, 36, 209, - 37, 36, 210, 210, 37, 36, 210, 117, - 210, 112, 113, 112, 112, 109, 37, 112, - 112, 112, 112, 208, 112, 208, 36, 211, - 211, 212, 213, 37, 212, 212, 212, 212, - 36, 211, 211, 213, 37, 36, 215, 214, - 216, 69, 216, 217, 215, 214, 217, 69, - 217, 218, 219, 218, 218, 217, 220, 215, - 218, 218, 218, 221, 218, 221, 214, 222, - 69, 222, 223, 223, 223, 217, 215, 223, - 223, 223, 223, 223, 214, 224, 69, 224, - 223, 223, 223, 217, 225, 215, 223, 223, - 223, 223, 223, 214, 226, 69, 226, 217, - 220, 215, 214, 216, 69, 216, 217, 215, - 227, 227, 214, 215, 69, 215, 228, 67, - 228, 69, 228, 229, 230, 229, 229, 70, - 231, 229, 229, 229, 232, 229, 232, 67, - 233, 69, 233, 234, 234, 234, 70, 234, - 234, 234, 234, 234, 67, 235, 69, 235, - 234, 234, 234, 70, 236, 234, 234, 234, - 234, 234, 67, 237, 69, 237, 70, 231, - 67, 68, 69, 68, 70, 238, 238, 67, - 239, 69, 239, 70, 241, 240, 240, 240, - 240, 67, 239, 69, 239, 70, 241, 67, - 243, 69, 243, 244, 242, 243, 69, 243, - 244, 215, 242, 244, 69, 244, 245, 246, - 245, 245, 244, 247, 215, 245, 245, 245, - 248, 245, 248, 242, 249, 69, 249, 250, - 250, 250, 244, 215, 250, 250, 250, 250, - 250, 242, 251, 69, 251, 250, 250, 250, - 244, 252, 215, 250, 250, 250, 250, 250, - 242, 253, 69, 253, 244, 247, 215, 242, - 243, 69, 243, 244, 215, 248, 248, 242, - 259, 69, 259, 261, 262, 37, 263, 254, - 255, 256, 257, 258, 260, 242, 243, 69, - 243, 244, 215, 260, 242, 243, 69, 243, - 244, 215, 254, 242, 243, 69, 243, 244, - 215, 255, 242, 243, 69, 243, 244, 215, - 256, 242, 243, 69, 243, 244, 215, 257, - 242, 251, 69, 251, 244, 252, 215, 242, - 264, 69, 264, 265, 266, 265, 265, 262, - 260, 109, 37, 263, 265, 254, 255, 256, - 257, 258, 260, 265, 260, 267, 260, 265, - 267, 260, 242, 264, 268, 264, 112, 113, - 112, 112, 109, 37, 112, 112, 112, 112, - 269, 112, 269, 36, 270, 37, 36, 271, - 271, 37, 36, 271, 117, 271, 112, 113, - 112, 112, 109, 37, 112, 112, 112, 112, - 269, 112, 269, 36, 272, 272, 273, 274, - 37, 273, 273, 273, 273, 36, 272, 272, - 274, 37, 36, 215, 242, 275, 69, 275, - 276, 261, 276, 276, 262, 260, 37, 263, - 276, 254, 255, 256, 257, 258, 260, 276, - 260, 276, 260, 276, 260, 242, 124, 69, - 124, 276, 261, 276, 276, 262, 260, 126, - 37, 263, 276, 254, 255, 256, 257, 258, - 260, 276, 260, 276, 260, 276, 260, 242, - 259, 69, 259, 262, 215, 260, 260, 242, - 124, 69, 124, 261, 262, 126, 37, 263, - 254, 255, 256, 257, 258, 260, 242, 277, - 69, 277, 261, 262, 260, 279, 37, 263, - 254, 255, 256, 257, 258, 260, 278, 260, - 278, 260, 278, 260, 242, 277, 69, 277, - 261, 262, 279, 37, 263, 254, 255, 256, - 257, 258, 260, 242, 259, 69, 259, 261, - 262, 215, 263, 254, 255, 256, 257, 258, - 260, 242, 285, 69, 285, 287, 288, 289, - 280, 281, 282, 283, 284, 286, 67, 68, - 69, 68, 70, 286, 67, 68, 69, 68, - 70, 280, 67, 68, 69, 68, 70, 281, - 67, 68, 69, 68, 70, 282, 67, 68, - 69, 68, 70, 283, 67, 235, 69, 235, - 70, 236, 67, 40, 69, 40, 290, 158, - 290, 290, 288, 286, 25, 289, 290, 280, - 281, 282, 283, 284, 286, 290, 286, 230, - 286, 290, 230, 286, 67, 291, 69, 291, - 292, 287, 292, 292, 288, 286, 289, 292, - 280, 281, 282, 283, 284, 286, 292, 286, - 292, 286, 292, 286, 67, 49, 69, 49, - 292, 287, 292, 292, 288, 286, 51, 289, - 292, 280, 281, 282, 283, 284, 286, 292, - 286, 292, 286, 292, 286, 67, 285, 69, - 285, 288, 286, 286, 67, 293, 69, 293, - 70, 295, 294, 294, 294, 294, 67, 293, - 69, 293, 70, 295, 67, 68, 69, 68, - 296, 67, 296, 69, 296, 71, 297, 71, - 71, 70, 73, 71, 71, 71, 74, 71, - 74, 67, 303, 69, 303, 154, 305, 306, - 298, 299, 300, 301, 302, 304, 67, 68, - 69, 68, 70, 304, 67, 68, 69, 68, - 70, 298, 67, 68, 69, 68, 70, 299, - 67, 68, 69, 68, 70, 300, 67, 68, - 69, 68, 70, 301, 67, 228, 69, 228, - 307, 158, 307, 307, 305, 304, 231, 306, - 307, 298, 299, 300, 301, 302, 304, 307, - 304, 297, 304, 307, 297, 304, 67, 308, - 69, 308, 309, 154, 309, 309, 305, 304, - 306, 309, 298, 299, 300, 301, 302, 304, - 309, 304, 309, 304, 309, 304, 67, 235, - 69, 235, 309, 154, 309, 309, 305, 304, - 236, 306, 309, 298, 299, 300, 301, 302, - 304, 309, 304, 309, 304, 309, 304, 67, - 303, 69, 303, 305, 304, 304, 67, 310, - 69, 310, 217, 312, 215, 311, 311, 311, - 311, 214, 310, 69, 310, 217, 312, 215, - 214, 243, 69, 243, 244, 37, 242, 318, - 69, 318, 320, 321, 37, 322, 313, 314, - 315, 316, 317, 319, 214, 216, 69, 216, - 217, 215, 319, 214, 216, 69, 216, 217, - 215, 313, 214, 216, 69, 216, 217, 215, - 314, 214, 216, 69, 216, 217, 215, 315, - 214, 216, 69, 216, 217, 215, 316, 214, - 224, 69, 224, 217, 225, 215, 214, 203, - 69, 203, 323, 324, 323, 323, 321, 319, - 109, 37, 322, 323, 313, 314, 315, 316, - 317, 319, 323, 319, 219, 319, 323, 219, - 319, 214, 325, 69, 325, 326, 320, 326, - 326, 321, 319, 37, 322, 326, 313, 314, - 315, 316, 317, 319, 326, 319, 326, 319, - 326, 319, 214, 124, 69, 124, 326, 320, - 326, 326, 321, 319, 126, 37, 322, 326, - 313, 314, 315, 316, 317, 319, 326, 319, - 326, 319, 326, 319, 214, 318, 69, 318, - 321, 37, 319, 319, 214, 124, 69, 124, - 320, 321, 126, 37, 322, 313, 314, 315, - 316, 317, 319, 214, 327, 69, 327, 328, - 200, 328, 328, 201, 199, 37, 202, 328, - 193, 194, 195, 196, 197, 199, 328, 199, - 328, 199, 328, 199, 180, 49, 69, 49, - 328, 200, 328, 328, 201, 199, 51, 37, - 202, 328, 193, 194, 195, 196, 197, 199, - 328, 199, 328, 199, 328, 199, 180, 198, - 69, 198, 201, 165, 199, 199, 180, 49, - 69, 49, 200, 201, 51, 37, 202, 193, - 194, 195, 196, 197, 199, 180, 329, 69, - 329, 200, 201, 199, 331, 37, 202, 193, - 194, 195, 196, 197, 199, 330, 199, 330, - 199, 330, 199, 180, 329, 69, 329, 200, - 201, 331, 37, 202, 193, 194, 195, 196, - 197, 199, 180, 338, 69, 338, 340, 341, - 215, 342, 333, 334, 335, 336, 337, 339, - 332, 343, 69, 343, 344, 345, 332, 344, - 69, 344, 346, 347, 346, 346, 344, 348, - 345, 346, 346, 346, 349, 346, 349, 332, - 350, 69, 350, 351, 351, 351, 344, 345, - 351, 351, 351, 351, 351, 332, 352, 69, - 352, 351, 351, 351, 344, 353, 345, 351, - 351, 351, 351, 351, 332, 354, 69, 354, - 344, 348, 345, 332, 343, 69, 343, 344, - 345, 355, 355, 332, 345, 69, 345, 357, - 356, 357, 69, 357, 358, 359, 358, 358, - 357, 360, 358, 358, 358, 361, 358, 361, - 356, 362, 69, 362, 363, 363, 363, 357, - 363, 363, 363, 363, 363, 356, 364, 69, - 364, 363, 363, 363, 357, 365, 363, 363, - 363, 363, 363, 356, 366, 69, 366, 357, - 360, 356, 345, 69, 345, 357, 367, 367, - 356, 368, 69, 368, 357, 370, 369, 369, - 369, 369, 356, 368, 69, 368, 357, 370, - 356, 372, 69, 372, 373, 371, 372, 69, - 372, 373, 345, 371, 373, 69, 373, 374, - 375, 374, 374, 373, 376, 345, 374, 374, - 374, 377, 374, 377, 371, 378, 69, 378, - 379, 379, 379, 373, 345, 379, 379, 379, - 379, 379, 371, 380, 69, 380, 379, 379, - 379, 373, 381, 345, 379, 379, 379, 379, - 379, 371, 382, 69, 382, 373, 376, 345, - 371, 372, 69, 372, 373, 345, 383, 383, - 371, 389, 69, 389, 391, 392, 37, 393, - 384, 385, 386, 387, 388, 390, 371, 372, - 69, 372, 373, 345, 390, 371, 372, 69, - 372, 373, 345, 384, 371, 372, 69, 372, - 373, 345, 385, 371, 372, 69, 372, 373, - 345, 386, 371, 372, 69, 372, 373, 345, - 387, 371, 380, 69, 380, 373, 381, 345, - 371, 264, 69, 264, 394, 395, 394, 394, - 392, 390, 109, 37, 393, 394, 384, 385, - 386, 387, 388, 390, 394, 390, 396, 390, - 394, 396, 390, 371, 397, 69, 397, 398, - 391, 398, 398, 392, 390, 37, 393, 398, - 384, 385, 386, 387, 388, 390, 398, 390, - 398, 390, 398, 390, 371, 49, 69, 49, - 398, 391, 398, 398, 392, 390, 51, 37, - 393, 398, 384, 385, 386, 387, 388, 390, - 398, 390, 398, 390, 398, 390, 371, 389, - 69, 389, 392, 345, 390, 390, 371, 49, - 69, 49, 391, 392, 51, 37, 393, 384, - 385, 386, 387, 388, 390, 371, 399, 69, - 399, 391, 392, 390, 401, 37, 393, 384, - 385, 386, 387, 388, 390, 400, 390, 400, - 390, 400, 390, 371, 399, 69, 399, 391, - 392, 401, 37, 393, 384, 385, 386, 387, - 388, 390, 371, 407, 69, 407, 391, 409, - 215, 410, 402, 403, 404, 405, 406, 408, - 371, 372, 69, 372, 373, 345, 408, 371, - 407, 69, 407, 391, 411, 37, 410, 402, - 403, 404, 405, 406, 408, 371, 372, 69, - 372, 373, 345, 402, 371, 372, 69, 372, - 373, 345, 403, 371, 372, 69, 372, 373, - 345, 404, 371, 372, 69, 372, 373, 345, - 405, 371, 412, 69, 412, 413, 395, 413, - 413, 411, 408, 220, 215, 410, 413, 402, - 403, 404, 405, 406, 408, 413, 408, 414, - 408, 413, 414, 408, 371, 412, 69, 412, - 218, 415, 218, 218, 217, 220, 215, 218, - 218, 218, 416, 218, 416, 214, 422, 69, - 422, 320, 424, 37, 425, 417, 418, 419, - 420, 421, 423, 214, 216, 69, 216, 217, - 215, 423, 214, 216, 69, 216, 217, 215, - 417, 214, 216, 69, 216, 217, 215, 418, - 214, 216, 69, 216, 217, 215, 419, 214, - 216, 69, 216, 217, 215, 420, 214, 40, - 69, 40, 426, 324, 426, 426, 424, 423, - 25, 37, 425, 426, 417, 418, 419, 420, - 421, 423, 426, 423, 415, 423, 426, 415, - 423, 214, 427, 69, 427, 428, 320, 428, - 428, 424, 423, 37, 425, 428, 417, 418, - 419, 420, 421, 423, 428, 423, 428, 423, - 428, 423, 214, 49, 69, 49, 428, 320, - 428, 428, 424, 423, 51, 37, 425, 428, - 417, 418, 419, 420, 421, 423, 428, 423, - 428, 423, 428, 423, 214, 422, 69, 422, - 424, 37, 423, 423, 214, 429, 69, 429, - 217, 431, 215, 430, 430, 430, 430, 214, - 429, 69, 429, 217, 431, 215, 214, 243, - 69, 243, 432, 215, 242, 432, 69, 432, - 245, 433, 245, 245, 244, 247, 215, 245, - 245, 245, 248, 245, 248, 242, 439, 69, - 439, 261, 441, 215, 442, 434, 435, 436, - 437, 438, 440, 242, 243, 69, 243, 244, - 215, 440, 242, 243, 69, 243, 244, 215, - 434, 242, 243, 69, 243, 244, 215, 435, - 242, 243, 69, 243, 244, 215, 436, 242, - 243, 69, 243, 244, 215, 437, 242, 443, - 69, 443, 444, 445, 444, 444, 441, 440, - 247, 215, 442, 444, 434, 435, 436, 437, - 438, 440, 444, 440, 433, 440, 444, 433, - 440, 242, 443, 69, 443, 245, 446, 245, - 245, 244, 247, 215, 245, 245, 245, 447, - 245, 447, 242, 453, 69, 453, 261, 455, - 37, 456, 448, 449, 450, 451, 452, 454, - 242, 243, 69, 243, 244, 215, 454, 242, - 243, 69, 243, 244, 215, 448, 242, 243, - 69, 243, 244, 215, 449, 242, 243, 69, - 243, 244, 215, 450, 242, 243, 69, 243, - 244, 215, 451, 242, 106, 69, 106, 457, - 266, 457, 457, 455, 454, 109, 37, 456, - 457, 448, 449, 450, 451, 452, 454, 457, - 454, 458, 454, 457, 458, 454, 242, 459, - 69, 459, 460, 261, 460, 460, 455, 454, - 37, 456, 460, 448, 449, 450, 451, 452, - 454, 460, 454, 460, 454, 460, 454, 242, - 49, 69, 49, 460, 261, 460, 460, 455, - 454, 51, 37, 456, 460, 448, 449, 450, - 451, 452, 454, 460, 454, 460, 454, 460, - 454, 242, 453, 69, 453, 455, 215, 454, - 454, 242, 461, 69, 461, 261, 455, 454, - 463, 37, 456, 448, 449, 450, 451, 452, - 454, 462, 454, 462, 454, 462, 454, 242, - 461, 69, 461, 261, 455, 463, 37, 456, - 448, 449, 450, 451, 452, 454, 242, 453, - 69, 453, 261, 455, 215, 456, 448, 449, - 450, 451, 452, 454, 242, 464, 69, 464, - 244, 466, 215, 465, 465, 465, 465, 242, - 464, 69, 464, 244, 466, 215, 242, 243, - 69, 243, 467, 215, 242, 467, 69, 467, - 245, 468, 245, 245, 244, 247, 215, 245, - 245, 245, 248, 245, 248, 242, 474, 69, - 474, 261, 476, 215, 477, 469, 470, 471, - 472, 473, 475, 242, 243, 69, 243, 244, - 215, 475, 242, 243, 69, 243, 244, 215, - 469, 242, 243, 69, 243, 244, 215, 470, - 242, 243, 69, 243, 244, 215, 471, 242, - 243, 69, 243, 244, 215, 472, 242, 412, - 69, 412, 478, 445, 478, 478, 476, 475, - 220, 215, 477, 478, 469, 470, 471, 472, - 473, 475, 478, 475, 468, 475, 478, 468, - 475, 242, 479, 69, 479, 480, 261, 480, - 480, 476, 475, 215, 477, 480, 469, 470, - 471, 472, 473, 475, 480, 475, 480, 475, - 480, 475, 242, 224, 69, 224, 480, 261, - 480, 480, 476, 475, 225, 215, 477, 480, - 469, 470, 471, 472, 473, 475, 480, 475, - 480, 475, 480, 475, 242, 474, 69, 474, - 476, 215, 475, 475, 242, 49, 69, 49, - 261, 262, 51, 37, 263, 254, 255, 256, - 257, 258, 260, 242, 481, 69, 481, 482, - 261, 482, 482, 441, 440, 215, 442, 482, - 434, 435, 436, 437, 438, 440, 482, 440, - 482, 440, 482, 440, 242, 251, 69, 251, - 482, 261, 482, 482, 441, 440, 252, 215, - 442, 482, 434, 435, 436, 437, 438, 440, - 482, 440, 482, 440, 482, 440, 242, 439, - 69, 439, 441, 215, 440, 440, 242, 483, - 69, 483, 484, 391, 484, 484, 411, 408, - 215, 410, 484, 402, 403, 404, 405, 406, - 408, 484, 408, 484, 408, 484, 408, 371, - 235, 69, 235, 484, 391, 484, 484, 411, - 408, 236, 215, 410, 484, 402, 403, 404, - 405, 406, 408, 484, 408, 484, 408, 484, - 408, 371, 407, 69, 407, 411, 345, 408, - 408, 371, 485, 69, 485, 391, 411, 408, - 487, 37, 410, 402, 403, 404, 405, 406, - 408, 486, 408, 486, 408, 486, 408, 371, - 485, 69, 485, 391, 411, 487, 37, 410, - 402, 403, 404, 405, 406, 408, 371, 407, - 69, 407, 391, 488, 215, 410, 402, 403, - 404, 405, 406, 408, 371, 412, 69, 412, - 413, 489, 413, 413, 411, 408, 220, 215, - 410, 413, 402, 403, 404, 405, 406, 408, - 413, 408, 414, 408, 413, 414, 408, 371, - 49, 69, 49, 391, 411, 51, 37, 410, - 402, 403, 404, 405, 406, 408, 371, 264, - 69, 264, 490, 489, 490, 490, 411, 408, - 109, 37, 410, 490, 402, 403, 404, 405, - 406, 408, 490, 408, 414, 408, 490, 414, - 408, 371, 491, 69, 491, 492, 391, 492, - 492, 411, 408, 37, 410, 492, 402, 403, - 404, 405, 406, 408, 492, 408, 492, 408, - 492, 408, 371, 49, 69, 49, 492, 391, - 492, 492, 411, 408, 51, 37, 410, 492, - 402, 403, 404, 405, 406, 408, 492, 408, - 492, 408, 492, 408, 371, 493, 69, 493, - 373, 495, 345, 494, 494, 494, 494, 371, - 493, 69, 493, 373, 495, 345, 371, 372, - 69, 372, 496, 345, 371, 496, 69, 496, - 374, 497, 374, 374, 373, 376, 345, 374, - 374, 374, 377, 374, 377, 371, 503, 69, - 503, 505, 506, 507, 498, 499, 500, 501, - 502, 504, 356, 345, 69, 345, 357, 504, - 356, 345, 69, 345, 357, 498, 356, 345, - 69, 345, 357, 499, 356, 345, 69, 345, - 357, 500, 356, 345, 69, 345, 357, 501, - 356, 364, 69, 364, 357, 365, 356, 40, - 69, 40, 508, 509, 508, 508, 506, 504, - 25, 507, 508, 498, 499, 500, 501, 502, - 504, 508, 504, 510, 504, 508, 510, 504, - 356, 511, 69, 511, 512, 505, 512, 512, - 506, 504, 507, 512, 498, 499, 500, 501, - 502, 504, 512, 504, 512, 504, 512, 504, - 356, 49, 69, 49, 512, 505, 512, 512, - 506, 504, 51, 507, 512, 498, 499, 500, - 501, 502, 504, 512, 504, 512, 504, 512, - 504, 356, 503, 69, 503, 506, 504, 504, - 356, 49, 69, 49, 505, 506, 51, 507, - 498, 499, 500, 501, 502, 504, 356, 513, - 69, 513, 505, 506, 504, 515, 507, 498, - 499, 500, 501, 502, 504, 514, 504, 514, - 504, 514, 504, 356, 513, 69, 513, 505, - 506, 515, 507, 498, 499, 500, 501, 502, - 504, 356, 521, 69, 521, 505, 523, 524, - 516, 517, 518, 519, 520, 522, 356, 345, - 69, 345, 357, 522, 356, 521, 69, 521, - 505, 525, 524, 516, 517, 518, 519, 520, - 522, 356, 345, 69, 345, 357, 516, 356, - 345, 69, 345, 357, 517, 356, 345, 69, - 345, 357, 518, 356, 345, 69, 345, 357, - 519, 356, 228, 69, 228, 526, 509, 526, - 526, 525, 522, 231, 524, 526, 516, 517, - 518, 519, 520, 522, 526, 522, 527, 522, - 526, 527, 522, 356, 528, 69, 528, 529, - 505, 529, 529, 525, 522, 524, 529, 516, - 517, 518, 519, 520, 522, 529, 522, 529, - 522, 529, 522, 356, 235, 69, 235, 529, - 505, 529, 529, 525, 522, 236, 524, 529, - 516, 517, 518, 519, 520, 522, 529, 522, - 529, 522, 529, 522, 356, 521, 69, 521, - 525, 522, 522, 356, 530, 69, 530, 505, - 525, 522, 532, 524, 516, 517, 518, 519, - 520, 522, 531, 522, 531, 522, 531, 522, - 356, 530, 69, 530, 505, 525, 532, 524, - 516, 517, 518, 519, 520, 522, 356, 521, - 69, 521, 505, 533, 524, 516, 517, 518, - 519, 520, 522, 356, 228, 69, 228, 526, - 534, 526, 526, 525, 522, 231, 524, 526, - 516, 517, 518, 519, 520, 522, 526, 522, - 527, 522, 526, 527, 522, 356, 49, 69, - 49, 505, 525, 51, 524, 516, 517, 518, - 519, 520, 522, 356, 40, 69, 40, 535, - 534, 535, 535, 525, 522, 25, 524, 535, - 516, 517, 518, 519, 520, 522, 535, 522, - 527, 522, 535, 527, 522, 356, 536, 69, - 536, 537, 505, 537, 537, 525, 522, 524, - 537, 516, 517, 518, 519, 520, 522, 537, - 522, 537, 522, 537, 522, 356, 49, 69, - 49, 537, 505, 537, 537, 525, 522, 51, - 524, 537, 516, 517, 518, 519, 520, 522, - 537, 522, 537, 522, 537, 522, 356, 538, - 69, 538, 357, 540, 539, 539, 539, 539, - 356, 538, 69, 538, 357, 540, 356, 345, - 69, 345, 541, 356, 541, 69, 541, 358, - 542, 358, 358, 357, 360, 358, 358, 358, - 361, 358, 361, 356, 543, 69, 543, 344, - 545, 345, 544, 544, 544, 544, 332, 543, - 69, 543, 344, 545, 345, 332, 372, 69, - 372, 373, 165, 371, 551, 69, 551, 553, - 554, 37, 555, 546, 547, 548, 549, 550, - 552, 332, 343, 69, 343, 344, 345, 552, - 332, 343, 69, 343, 344, 345, 546, 332, - 343, 69, 343, 344, 345, 547, 332, 343, - 69, 343, 344, 345, 548, 332, 343, 69, - 343, 344, 345, 549, 332, 352, 69, 352, - 344, 353, 345, 332, 203, 69, 203, 556, - 557, 556, 556, 554, 552, 109, 37, 555, - 556, 546, 547, 548, 549, 550, 552, 556, - 552, 558, 552, 556, 558, 552, 332, 559, - 69, 559, 560, 553, 560, 560, 554, 552, - 37, 555, 560, 546, 547, 548, 549, 550, - 552, 560, 552, 560, 552, 560, 552, 332, - 49, 69, 49, 560, 553, 560, 560, 554, - 552, 51, 37, 555, 560, 546, 547, 548, - 549, 550, 552, 560, 552, 560, 552, 560, - 552, 332, 551, 69, 551, 554, 165, 552, - 552, 332, 49, 69, 49, 553, 554, 51, - 37, 555, 546, 547, 548, 549, 550, 552, - 332, 561, 69, 561, 553, 554, 552, 563, - 37, 555, 546, 547, 548, 549, 550, 552, - 562, 552, 562, 552, 562, 552, 332, 561, - 69, 561, 553, 554, 563, 37, 555, 546, - 547, 548, 549, 550, 552, 332, 569, 69, - 569, 571, 572, 215, 573, 564, 565, 566, - 567, 568, 570, 332, 343, 69, 343, 344, - 345, 570, 332, 569, 69, 569, 571, 574, - 37, 573, 564, 565, 566, 567, 568, 570, - 332, 343, 69, 343, 344, 345, 564, 332, - 343, 69, 343, 344, 345, 565, 332, 343, - 69, 343, 344, 345, 566, 332, 343, 69, - 343, 344, 345, 567, 332, 575, 69, 575, - 344, 576, 345, 332, 577, 69, 577, 344, - 578, 345, 332, 343, 69, 343, 344, 345, - 579, 579, 332, 580, 69, 580, 344, 371, - 345, 581, 581, 581, 581, 332, 580, 69, - 580, 344, 371, 345, 332, 582, 69, 582, - 583, 557, 583, 583, 574, 570, 220, 215, - 573, 583, 564, 565, 566, 567, 568, 570, - 583, 570, 584, 570, 583, 584, 570, 332, - 582, 69, 582, 218, 415, 218, 218, 217, - 220, 215, 218, 218, 218, 585, 218, 585, - 214, 586, 69, 586, 217, 588, 215, 587, - 587, 587, 587, 214, 586, 69, 586, 217, - 588, 215, 214, 216, 69, 216, 589, 215, - 214, 589, 69, 589, 590, 591, 590, 590, - 217, 592, 215, 590, 590, 590, 221, 590, - 221, 214, 593, 69, 593, 594, 594, 594, - 217, 215, 594, 594, 594, 594, 594, 214, - 595, 69, 595, 594, 594, 594, 217, 596, - 215, 594, 594, 594, 594, 594, 214, 597, - 69, 597, 217, 592, 215, 214, 216, 69, - 216, 217, 215, 598, 598, 214, 599, 69, - 599, 217, 242, 215, 600, 600, 600, 600, - 214, 599, 69, 599, 217, 242, 215, 214, - 606, 69, 606, 608, 609, 215, 610, 601, - 602, 603, 604, 605, 607, 214, 216, 69, - 216, 217, 215, 607, 214, 216, 69, 216, - 217, 215, 601, 214, 216, 69, 216, 217, - 215, 602, 214, 216, 69, 216, 217, 215, - 603, 214, 216, 69, 216, 217, 215, 604, - 214, 595, 69, 595, 217, 596, 215, 214, - 582, 69, 582, 611, 612, 611, 611, 609, - 607, 220, 215, 610, 611, 601, 602, 603, - 604, 605, 607, 611, 607, 591, 607, 611, - 591, 607, 214, 613, 69, 613, 614, 608, - 614, 614, 609, 607, 215, 610, 614, 601, - 602, 603, 604, 605, 607, 614, 607, 614, - 607, 614, 607, 214, 224, 69, 224, 614, - 608, 614, 614, 609, 607, 225, 215, 610, - 614, 601, 602, 603, 604, 605, 607, 614, - 607, 614, 607, 614, 607, 214, 606, 69, - 606, 609, 215, 607, 607, 214, 49, 69, - 49, 320, 321, 51, 37, 322, 313, 314, - 315, 316, 317, 319, 214, 615, 69, 615, - 616, 571, 616, 616, 574, 570, 215, 573, - 616, 564, 565, 566, 567, 568, 570, 616, - 570, 616, 570, 616, 570, 332, 235, 69, - 235, 616, 571, 616, 616, 574, 570, 236, - 215, 573, 616, 564, 565, 566, 567, 568, - 570, 616, 570, 616, 570, 616, 570, 332, - 569, 69, 569, 574, 345, 570, 570, 332, - 617, 69, 617, 571, 574, 570, 619, 37, - 573, 564, 565, 566, 567, 568, 570, 618, - 570, 618, 570, 618, 570, 332, 617, 69, - 617, 571, 574, 619, 37, 573, 564, 565, - 566, 567, 568, 570, 332, 569, 69, 569, - 571, 620, 215, 573, 564, 565, 566, 567, - 568, 570, 332, 582, 69, 582, 583, 621, - 583, 583, 574, 570, 220, 215, 573, 583, - 564, 565, 566, 567, 568, 570, 583, 570, - 584, 570, 583, 584, 570, 332, 49, 69, - 49, 571, 574, 51, 37, 573, 564, 565, - 566, 567, 568, 570, 332, 203, 69, 203, - 622, 621, 622, 622, 574, 570, 109, 37, - 573, 622, 564, 565, 566, 567, 568, 570, - 622, 570, 584, 570, 622, 584, 570, 332, - 623, 69, 623, 624, 571, 624, 624, 574, - 570, 37, 573, 624, 564, 565, 566, 567, - 568, 570, 624, 570, 624, 570, 624, 570, - 332, 49, 69, 49, 624, 571, 624, 624, - 574, 570, 51, 37, 573, 624, 564, 565, - 566, 567, 568, 570, 624, 570, 624, 570, - 624, 570, 332, 625, 69, 625, 344, 627, - 345, 626, 626, 626, 626, 332, 625, 69, - 625, 344, 627, 345, 332, 343, 69, 343, - 628, 345, 332, 628, 69, 628, 629, 630, - 629, 629, 344, 578, 345, 629, 629, 629, - 349, 629, 349, 332, 631, 69, 631, 632, - 632, 632, 344, 345, 632, 632, 632, 632, - 632, 332, 575, 69, 575, 632, 632, 632, - 344, 576, 345, 632, 632, 632, 632, 632, - 332, 343, 69, 343, 344, 345, 339, 332, - 338, 69, 338, 340, 633, 37, 342, 333, - 334, 335, 336, 337, 339, 332, 343, 69, - 343, 344, 345, 333, 332, 343, 69, 343, - 344, 345, 334, 332, 343, 69, 343, 344, - 345, 335, 332, 343, 69, 343, 344, 345, - 336, 332, 634, 69, 634, 344, 635, 345, - 332, 636, 69, 636, 344, 637, 345, 332, - 343, 69, 343, 344, 345, 638, 638, 332, - 582, 69, 582, 639, 557, 639, 639, 633, - 339, 220, 215, 342, 639, 333, 334, 335, - 336, 337, 339, 639, 339, 640, 339, 639, - 640, 339, 332, 641, 69, 641, 642, 340, - 642, 642, 633, 339, 215, 342, 642, 333, - 334, 335, 336, 337, 339, 642, 339, 642, - 339, 642, 339, 332, 235, 69, 235, 642, - 340, 642, 642, 633, 339, 236, 215, 342, - 642, 333, 334, 335, 336, 337, 339, 642, - 339, 642, 339, 642, 339, 332, 338, 69, - 338, 633, 345, 339, 339, 332, 643, 69, - 643, 340, 633, 339, 645, 37, 342, 333, - 334, 335, 336, 337, 339, 644, 339, 644, - 339, 644, 339, 332, 643, 69, 643, 340, - 633, 645, 37, 342, 333, 334, 335, 336, - 337, 339, 332, 338, 69, 338, 340, 646, - 215, 342, 333, 334, 335, 336, 337, 339, - 332, 582, 69, 582, 639, 621, 639, 639, - 633, 339, 220, 215, 342, 639, 333, 334, - 335, 336, 337, 339, 639, 339, 640, 339, - 639, 640, 339, 332, 203, 69, 203, 647, - 648, 647, 647, 633, 339, 109, 37, 342, - 647, 333, 334, 335, 336, 337, 339, 647, - 339, 640, 339, 647, 640, 339, 332, 649, - 69, 649, 650, 340, 650, 650, 633, 339, - 37, 342, 650, 333, 334, 335, 336, 337, - 339, 650, 339, 650, 339, 650, 339, 332, - 49, 69, 49, 650, 340, 650, 650, 633, - 339, 51, 37, 342, 650, 333, 334, 335, - 336, 337, 339, 650, 339, 650, 339, 650, - 339, 332, 49, 69, 49, 340, 633, 51, - 37, 342, 333, 334, 335, 336, 337, 339, - 332, 651, 69, 651, 182, 653, 165, 652, - 652, 652, 652, 180, 651, 69, 651, 182, - 653, 165, 180, 343, 69, 343, 654, 345, - 332, 654, 69, 654, 655, 656, 655, 655, - 344, 637, 345, 655, 655, 655, 349, 655, - 349, 332, 657, 69, 657, 658, 658, 658, - 344, 345, 658, 658, 658, 658, 658, 332, - 634, 69, 634, 658, 658, 658, 344, 635, - 345, 658, 658, 658, 658, 658, 332, 664, - 69, 664, 666, 667, 668, 659, 660, 661, - 662, 663, 665, 164, 165, 69, 165, 166, - 665, 164, 165, 69, 165, 166, 659, 164, - 165, 69, 165, 166, 660, 164, 165, 69, - 165, 166, 661, 164, 165, 69, 165, 166, - 662, 164, 173, 69, 173, 166, 174, 164, - 40, 69, 40, 669, 670, 669, 669, 667, - 665, 25, 668, 669, 659, 660, 661, 662, - 663, 665, 669, 665, 671, 665, 669, 671, - 665, 164, 672, 69, 672, 673, 666, 673, - 673, 667, 665, 668, 673, 659, 660, 661, - 662, 663, 665, 673, 665, 673, 665, 673, - 665, 164, 49, 69, 49, 673, 666, 673, - 673, 667, 665, 51, 668, 673, 659, 660, - 661, 662, 663, 665, 673, 665, 673, 665, - 673, 665, 164, 664, 69, 664, 667, 665, - 665, 164, 49, 69, 49, 666, 667, 51, - 668, 659, 660, 661, 662, 663, 665, 164, - 674, 69, 674, 666, 667, 665, 676, 668, - 659, 660, 661, 662, 663, 665, 675, 665, - 675, 665, 675, 665, 164, 674, 69, 674, - 666, 667, 676, 668, 659, 660, 661, 662, - 663, 665, 164, 682, 69, 682, 684, 685, - 686, 677, 678, 679, 680, 681, 683, 356, - 345, 69, 345, 357, 683, 356, 682, 69, - 682, 684, 687, 686, 677, 678, 679, 680, - 681, 683, 356, 345, 69, 345, 357, 677, - 356, 345, 69, 345, 357, 678, 356, 345, - 69, 345, 357, 679, 356, 345, 69, 345, - 357, 680, 356, 688, 69, 688, 357, 689, - 356, 690, 69, 690, 357, 691, 356, 345, - 69, 345, 357, 692, 692, 356, 693, 69, - 693, 357, 695, 694, 694, 694, 694, 356, - 693, 69, 693, 357, 695, 356, 343, 69, - 343, 344, 332, 228, 69, 228, 696, 509, - 696, 696, 687, 683, 231, 686, 696, 677, - 678, 679, 680, 681, 683, 696, 683, 697, - 683, 696, 697, 683, 356, 698, 69, 698, - 699, 684, 699, 699, 687, 683, 686, 699, - 677, 678, 679, 680, 681, 683, 699, 683, - 699, 683, 699, 683, 356, 235, 69, 235, - 699, 684, 699, 699, 687, 683, 236, 686, - 699, 677, 678, 679, 680, 681, 683, 699, - 683, 699, 683, 699, 683, 356, 682, 69, - 682, 687, 683, 683, 356, 700, 69, 700, - 684, 687, 683, 702, 686, 677, 678, 679, - 680, 681, 683, 701, 683, 701, 683, 701, - 683, 356, 700, 69, 700, 684, 687, 702, - 686, 677, 678, 679, 680, 681, 683, 356, - 682, 69, 682, 684, 703, 686, 677, 678, - 679, 680, 681, 683, 356, 228, 69, 228, - 696, 534, 696, 696, 687, 683, 231, 686, - 696, 677, 678, 679, 680, 681, 683, 696, - 683, 697, 683, 696, 697, 683, 356, 40, - 69, 40, 704, 705, 704, 704, 687, 683, - 25, 686, 704, 677, 678, 679, 680, 681, - 683, 704, 683, 697, 683, 704, 697, 683, - 356, 706, 69, 706, 707, 684, 707, 707, - 687, 683, 686, 707, 677, 678, 679, 680, - 681, 683, 707, 683, 707, 683, 707, 683, - 356, 49, 69, 49, 707, 684, 707, 707, - 687, 683, 51, 686, 707, 677, 678, 679, - 680, 681, 683, 707, 683, 707, 683, 707, - 683, 356, 49, 69, 49, 684, 687, 51, - 686, 677, 678, 679, 680, 681, 683, 356, - 708, 69, 708, 166, 710, 709, 709, 709, - 709, 164, 708, 69, 708, 166, 710, 164, - 345, 69, 345, 711, 356, 711, 69, 711, - 712, 713, 712, 712, 357, 691, 712, 712, - 712, 361, 712, 361, 356, 714, 69, 714, - 715, 715, 715, 357, 715, 715, 715, 715, - 715, 356, 688, 69, 688, 715, 715, 715, - 357, 689, 715, 715, 715, 715, 715, 356, - 1, 0 + 69, 93, 86, 94, 68, 84, 86, 69, + 86, 106, 107, 106, 106, 104, 102, 89, + 68, 105, 106, 96, 97, 98, 99, 100, + 102, 106, 102, 88, 102, 106, 88, 102, + 84, 108, 69, 108, 109, 103, 109, 109, + 104, 102, 68, 105, 109, 96, 97, 98, + 99, 100, 102, 109, 102, 109, 102, 109, + 102, 84, 93, 69, 93, 109, 103, 109, + 109, 104, 102, 94, 68, 105, 109, 96, + 97, 98, 99, 100, 102, 109, 102, 109, + 102, 109, 102, 84, 101, 69, 101, 104, + 68, 102, 102, 84, 93, 69, 93, 103, + 104, 94, 68, 105, 96, 97, 98, 99, + 100, 102, 84, 115, 69, 115, 117, 118, + 119, 110, 111, 112, 113, 114, 116, 67, + 68, 69, 68, 70, 116, 67, 68, 69, + 68, 70, 110, 67, 68, 69, 68, 70, + 111, 67, 68, 69, 68, 70, 112, 67, + 68, 69, 68, 70, 113, 67, 77, 69, + 77, 70, 78, 67, 70, 69, 70, 120, + 121, 120, 120, 118, 116, 73, 119, 120, + 110, 111, 112, 113, 114, 116, 120, 116, + 72, 116, 120, 72, 116, 67, 122, 69, + 122, 123, 117, 123, 123, 118, 116, 119, + 123, 110, 111, 112, 113, 114, 116, 123, + 116, 123, 116, 123, 116, 67, 77, 69, + 77, 123, 117, 123, 123, 118, 116, 78, + 119, 123, 110, 111, 112, 113, 114, 116, + 123, 116, 123, 116, 123, 116, 67, 115, + 69, 115, 118, 116, 116, 67, 77, 69, + 77, 117, 118, 78, 119, 110, 111, 112, + 113, 114, 116, 67, 124, 124, 125, 126, + 125, 125, 125, 125, 1, 124, 124, 126, + 1, 127, 128, 69, 128, 129, 127, 129, + 69, 129, 130, 131, 130, 130, 129, 132, + 130, 130, 130, 133, 130, 133, 127, 134, + 69, 134, 135, 135, 135, 129, 135, 135, + 135, 135, 135, 127, 136, 69, 136, 135, + 135, 135, 129, 137, 135, 135, 135, 135, + 135, 127, 138, 69, 138, 129, 132, 127, + 128, 69, 128, 129, 139, 139, 127, 140, + 69, 140, 129, 142, 141, 141, 141, 141, + 127, 140, 69, 140, 129, 142, 127, 144, + 69, 144, 145, 143, 144, 69, 144, 145, + 128, 143, 145, 69, 145, 146, 147, 146, + 146, 145, 148, 128, 146, 146, 146, 149, + 146, 149, 143, 150, 69, 150, 151, 151, + 151, 145, 128, 151, 151, 151, 151, 151, + 143, 152, 69, 152, 151, 151, 151, 145, + 153, 128, 151, 151, 151, 151, 151, 143, + 154, 69, 154, 145, 148, 128, 143, 144, + 69, 144, 145, 128, 155, 155, 143, 161, + 69, 161, 163, 164, 128, 165, 156, 157, + 158, 159, 160, 162, 143, 144, 69, 144, + 145, 128, 162, 143, 144, 69, 144, 145, + 128, 156, 143, 144, 69, 144, 145, 128, + 157, 143, 144, 69, 144, 145, 128, 158, + 143, 144, 69, 144, 145, 128, 159, 143, + 152, 69, 152, 145, 153, 128, 143, 145, + 69, 145, 166, 167, 166, 166, 164, 162, + 148, 128, 165, 166, 156, 157, 158, 159, + 160, 162, 166, 162, 168, 162, 166, 168, + 162, 143, 169, 69, 169, 170, 163, 170, + 170, 164, 162, 128, 165, 170, 156, 157, + 158, 159, 160, 162, 170, 162, 170, 162, + 170, 162, 143, 152, 69, 152, 170, 163, + 170, 170, 164, 162, 153, 128, 165, 170, + 156, 157, 158, 159, 160, 162, 170, 162, + 170, 162, 170, 162, 143, 161, 69, 161, + 164, 128, 162, 162, 143, 152, 69, 152, + 163, 164, 153, 128, 165, 156, 157, 158, + 159, 160, 162, 143, 171, 69, 171, 163, + 164, 162, 173, 128, 165, 156, 157, 158, + 159, 160, 162, 172, 162, 172, 162, 172, + 162, 143, 171, 69, 171, 163, 164, 173, + 128, 165, 156, 157, 158, 159, 160, 162, + 143, 180, 69, 180, 182, 183, 184, 185, + 175, 176, 177, 178, 179, 181, 174, 186, + 69, 186, 187, 184, 174, 187, 69, 187, + 188, 189, 188, 188, 187, 190, 184, 188, + 188, 188, 191, 188, 191, 174, 192, 69, + 192, 193, 193, 193, 187, 184, 193, 193, + 193, 193, 193, 174, 194, 69, 194, 193, + 193, 193, 187, 195, 184, 193, 193, 193, + 193, 193, 174, 196, 69, 196, 187, 190, + 184, 174, 186, 69, 186, 187, 184, 197, + 197, 174, 184, 69, 184, 199, 198, 199, + 69, 199, 200, 201, 200, 200, 199, 202, + 200, 200, 200, 203, 200, 203, 198, 204, + 69, 204, 205, 205, 205, 199, 205, 205, + 205, 205, 205, 198, 206, 69, 206, 205, + 205, 205, 199, 207, 205, 205, 205, 205, + 205, 198, 208, 69, 208, 199, 202, 198, + 184, 69, 184, 199, 209, 209, 198, 210, + 69, 210, 199, 212, 211, 211, 211, 211, + 198, 210, 69, 210, 199, 212, 198, 214, + 69, 214, 215, 213, 214, 69, 214, 215, + 184, 213, 215, 69, 215, 216, 217, 216, + 216, 215, 218, 184, 216, 216, 216, 219, + 216, 219, 213, 220, 69, 220, 221, 221, + 221, 215, 184, 221, 221, 221, 221, 221, + 213, 222, 69, 222, 221, 221, 221, 215, + 223, 184, 221, 221, 221, 221, 221, 213, + 224, 69, 224, 215, 218, 184, 213, 214, + 69, 214, 215, 184, 225, 225, 213, 231, + 69, 231, 233, 234, 184, 235, 226, 227, + 228, 229, 230, 232, 213, 214, 69, 214, + 215, 184, 232, 213, 214, 69, 214, 215, + 184, 226, 213, 214, 69, 214, 215, 184, + 227, 213, 214, 69, 214, 215, 184, 228, + 213, 214, 69, 214, 215, 184, 229, 213, + 222, 69, 222, 215, 223, 184, 213, 215, + 69, 215, 236, 237, 236, 236, 234, 232, + 218, 184, 235, 236, 226, 227, 228, 229, + 230, 232, 236, 232, 238, 232, 236, 238, + 232, 213, 239, 69, 239, 240, 233, 240, + 240, 234, 232, 184, 235, 240, 226, 227, + 228, 229, 230, 232, 240, 232, 240, 232, + 240, 232, 213, 222, 69, 222, 240, 233, + 240, 240, 234, 232, 223, 184, 235, 240, + 226, 227, 228, 229, 230, 232, 240, 232, + 240, 232, 240, 232, 213, 231, 69, 231, + 234, 184, 232, 232, 213, 222, 69, 222, + 233, 234, 223, 184, 235, 226, 227, 228, + 229, 230, 232, 213, 241, 69, 241, 233, + 234, 232, 243, 184, 235, 226, 227, 228, + 229, 230, 232, 242, 232, 242, 232, 242, + 232, 213, 241, 69, 241, 233, 234, 243, + 184, 235, 226, 227, 228, 229, 230, 232, + 213, 250, 69, 250, 252, 253, 184, 254, + 245, 246, 247, 248, 249, 251, 244, 255, + 69, 255, 256, 184, 244, 256, 69, 256, + 257, 258, 257, 257, 256, 259, 184, 257, + 257, 257, 260, 257, 260, 244, 261, 69, + 261, 262, 262, 262, 256, 184, 262, 262, + 262, 262, 262, 244, 263, 69, 263, 262, + 262, 262, 256, 264, 184, 262, 262, 262, + 262, 262, 244, 265, 69, 265, 256, 259, + 184, 244, 255, 69, 255, 256, 184, 266, + 266, 244, 267, 69, 267, 256, 213, 184, + 268, 268, 268, 268, 244, 267, 69, 267, + 256, 213, 184, 244, 274, 69, 274, 276, + 277, 184, 278, 269, 270, 271, 272, 273, + 275, 244, 255, 69, 255, 256, 184, 275, + 244, 255, 69, 255, 256, 184, 269, 244, + 255, 69, 255, 256, 184, 270, 244, 255, + 69, 255, 256, 184, 271, 244, 255, 69, + 255, 256, 184, 272, 244, 263, 69, 263, + 256, 264, 184, 244, 256, 69, 256, 279, + 280, 279, 279, 277, 275, 259, 68, 278, + 279, 269, 270, 271, 272, 273, 275, 279, + 275, 281, 275, 279, 281, 275, 244, 282, + 69, 282, 283, 276, 283, 283, 277, 275, + 184, 278, 283, 269, 270, 271, 272, 273, + 275, 283, 275, 283, 275, 283, 275, 244, + 263, 69, 263, 283, 276, 283, 283, 277, + 275, 264, 184, 278, 283, 269, 270, 271, + 272, 273, 275, 283, 275, 283, 275, 283, + 275, 244, 274, 69, 274, 277, 184, 275, + 275, 244, 263, 69, 263, 276, 277, 264, + 184, 278, 269, 270, 271, 272, 273, 275, + 244, 284, 69, 284, 276, 277, 275, 286, + 184, 278, 269, 270, 271, 272, 273, 275, + 285, 275, 285, 275, 285, 275, 244, 284, + 69, 284, 276, 277, 286, 184, 278, 269, + 270, 271, 272, 273, 275, 244, 292, 69, + 292, 252, 294, 184, 295, 287, 288, 289, + 290, 291, 293, 244, 255, 69, 255, 256, + 184, 293, 244, 292, 69, 292, 252, 296, + 184, 295, 287, 288, 289, 290, 291, 293, + 244, 255, 69, 255, 256, 184, 287, 244, + 255, 69, 255, 256, 184, 288, 244, 255, + 69, 255, 256, 184, 289, 244, 255, 69, + 255, 256, 184, 290, 244, 297, 69, 297, + 256, 298, 184, 244, 299, 69, 299, 256, + 300, 184, 244, 255, 69, 255, 256, 184, + 301, 301, 244, 256, 69, 256, 302, 280, + 302, 302, 296, 293, 259, 68, 295, 302, + 287, 288, 289, 290, 291, 293, 302, 293, + 303, 293, 302, 303, 293, 244, 304, 69, + 304, 305, 252, 305, 305, 296, 293, 184, + 295, 305, 287, 288, 289, 290, 291, 293, + 305, 293, 305, 293, 305, 293, 244, 263, + 69, 263, 305, 252, 305, 305, 296, 293, + 264, 184, 295, 305, 287, 288, 289, 290, + 291, 293, 305, 293, 305, 293, 305, 293, + 244, 292, 69, 292, 296, 184, 293, 293, + 244, 306, 69, 306, 252, 296, 293, 286, + 184, 295, 287, 288, 289, 290, 291, 293, + 307, 293, 307, 293, 307, 293, 244, 306, + 69, 306, 252, 296, 286, 184, 295, 287, + 288, 289, 290, 291, 293, 244, 308, 69, + 308, 309, 310, 309, 309, 296, 293, 300, + 68, 295, 309, 287, 288, 289, 290, 291, + 293, 309, 293, 303, 293, 309, 303, 293, + 244, 308, 69, 308, 311, 312, 311, 311, + 256, 300, 184, 311, 311, 311, 260, 311, + 260, 244, 313, 69, 313, 314, 314, 314, + 256, 184, 314, 314, 314, 314, 314, 244, + 297, 69, 297, 314, 314, 314, 256, 298, + 184, 314, 314, 314, 314, 314, 244, 315, + 69, 315, 256, 317, 184, 316, 316, 316, + 316, 244, 315, 69, 315, 256, 317, 184, + 244, 255, 69, 255, 308, 184, 244, 318, + 69, 318, 319, 252, 319, 319, 296, 293, + 184, 295, 319, 287, 288, 289, 290, 291, + 293, 319, 293, 319, 293, 319, 293, 244, + 297, 69, 297, 319, 252, 319, 319, 296, + 293, 298, 184, 295, 319, 287, 288, 289, + 290, 291, 293, 319, 293, 319, 293, 319, + 293, 244, 297, 69, 297, 252, 296, 298, + 184, 295, 287, 288, 289, 290, 291, 293, + 244, 255, 69, 255, 256, 184, 251, 244, + 250, 69, 250, 252, 320, 184, 254, 245, + 246, 247, 248, 249, 251, 244, 255, 69, + 255, 256, 184, 245, 244, 255, 69, 255, + 256, 184, 246, 244, 255, 69, 255, 256, + 184, 247, 244, 255, 69, 255, 256, 184, + 248, 244, 256, 69, 256, 321, 322, 321, + 321, 320, 251, 259, 184, 254, 321, 245, + 246, 247, 248, 249, 251, 321, 251, 323, + 251, 321, 323, 251, 244, 324, 69, 324, + 325, 252, 325, 325, 320, 251, 184, 254, + 325, 245, 246, 247, 248, 249, 251, 325, + 251, 325, 251, 325, 251, 244, 263, 69, + 263, 325, 252, 325, 325, 320, 251, 264, + 184, 254, 325, 245, 246, 247, 248, 249, + 251, 325, 251, 325, 251, 325, 251, 244, + 250, 69, 250, 320, 184, 251, 251, 244, + 222, 69, 222, 276, 277, 223, 184, 278, + 269, 270, 271, 272, 273, 275, 244, 326, + 69, 326, 252, 320, 251, 328, 184, 254, + 245, 246, 247, 248, 249, 251, 327, 251, + 327, 251, 327, 251, 244, 326, 69, 326, + 252, 320, 328, 184, 254, 245, 246, 247, + 248, 249, 251, 244, 250, 69, 250, 252, + 329, 184, 254, 245, 246, 247, 248, 249, + 251, 244, 308, 69, 308, 330, 310, 330, + 330, 320, 251, 300, 184, 254, 330, 245, + 246, 247, 248, 249, 251, 330, 251, 323, + 251, 330, 323, 251, 244, 331, 69, 331, + 332, 252, 332, 332, 320, 251, 184, 254, + 332, 245, 246, 247, 248, 249, 251, 332, + 251, 332, 251, 332, 251, 244, 297, 69, + 297, 332, 252, 332, 332, 320, 251, 298, + 184, 254, 332, 245, 246, 247, 248, 249, + 251, 332, 251, 332, 251, 332, 251, 244, + 333, 69, 333, 330, 334, 330, 330, 320, + 251, 300, 184, 254, 330, 245, 246, 247, + 248, 249, 251, 330, 251, 323, 251, 330, + 323, 251, 244, 333, 69, 333, 311, 335, + 311, 311, 256, 300, 184, 311, 311, 311, + 260, 311, 260, 244, 297, 69, 297, 252, + 320, 298, 184, 254, 245, 246, 247, 248, + 249, 251, 244, 336, 69, 336, 215, 338, + 184, 337, 337, 337, 337, 213, 336, 69, + 336, 215, 338, 184, 213, 255, 69, 255, + 333, 184, 244, 344, 69, 344, 346, 347, + 348, 339, 340, 341, 342, 343, 345, 198, + 184, 69, 184, 199, 345, 198, 184, 69, + 184, 199, 339, 198, 184, 69, 184, 199, + 340, 198, 184, 69, 184, 199, 341, 198, + 184, 69, 184, 199, 342, 198, 206, 69, + 206, 199, 207, 198, 199, 69, 199, 349, + 350, 349, 349, 347, 345, 202, 348, 349, + 339, 340, 341, 342, 343, 345, 349, 345, + 351, 345, 349, 351, 345, 198, 352, 69, + 352, 353, 346, 353, 353, 347, 345, 348, + 353, 339, 340, 341, 342, 343, 345, 353, + 345, 353, 345, 353, 345, 198, 206, 69, + 206, 353, 346, 353, 353, 347, 345, 207, + 348, 353, 339, 340, 341, 342, 343, 345, + 353, 345, 353, 345, 353, 345, 198, 344, + 69, 344, 347, 345, 345, 198, 206, 69, + 206, 346, 347, 207, 348, 339, 340, 341, + 342, 343, 345, 198, 354, 69, 354, 346, + 347, 345, 356, 348, 339, 340, 341, 342, + 343, 345, 355, 345, 355, 345, 355, 345, + 198, 354, 69, 354, 346, 347, 356, 348, + 339, 340, 341, 342, 343, 345, 198, 362, + 69, 362, 364, 365, 366, 357, 358, 359, + 360, 361, 363, 198, 184, 69, 184, 199, + 363, 198, 362, 69, 362, 364, 367, 366, + 357, 358, 359, 360, 361, 363, 198, 184, + 69, 184, 199, 357, 198, 184, 69, 184, + 199, 358, 198, 184, 69, 184, 199, 359, + 198, 184, 69, 184, 199, 360, 198, 368, + 69, 368, 199, 369, 198, 370, 69, 370, + 199, 371, 198, 184, 69, 184, 199, 372, + 372, 198, 373, 69, 373, 199, 375, 374, + 374, 374, 374, 198, 373, 69, 373, 199, + 375, 198, 255, 69, 255, 256, 244, 199, + 69, 199, 376, 350, 376, 376, 367, 363, + 202, 366, 376, 357, 358, 359, 360, 361, + 363, 376, 363, 377, 363, 376, 377, 363, + 198, 378, 69, 378, 379, 364, 379, 379, + 367, 363, 366, 379, 357, 358, 359, 360, + 361, 363, 379, 363, 379, 363, 379, 363, + 198, 206, 69, 206, 379, 364, 379, 379, + 367, 363, 207, 366, 379, 357, 358, 359, + 360, 361, 363, 379, 363, 379, 363, 379, + 363, 198, 362, 69, 362, 367, 363, 363, + 198, 380, 69, 380, 364, 367, 363, 356, + 366, 357, 358, 359, 360, 361, 363, 381, + 363, 381, 363, 381, 363, 198, 380, 69, + 380, 364, 367, 356, 366, 357, 358, 359, + 360, 361, 363, 198, 382, 69, 382, 383, + 384, 383, 383, 367, 363, 371, 366, 383, + 357, 358, 359, 360, 361, 363, 383, 363, + 377, 363, 383, 377, 363, 198, 382, 69, + 382, 385, 386, 385, 385, 199, 371, 385, + 385, 385, 203, 385, 203, 198, 387, 69, + 387, 388, 388, 388, 199, 388, 388, 388, + 388, 388, 198, 368, 69, 368, 388, 388, + 388, 199, 369, 388, 388, 388, 388, 388, + 198, 389, 69, 389, 199, 391, 390, 390, + 390, 390, 198, 389, 69, 389, 199, 391, + 198, 184, 69, 184, 382, 198, 392, 69, + 392, 393, 364, 393, 393, 367, 363, 366, + 393, 357, 358, 359, 360, 361, 363, 393, + 363, 393, 363, 393, 363, 198, 368, 69, + 368, 393, 364, 393, 393, 367, 363, 369, + 366, 393, 357, 358, 359, 360, 361, 363, + 393, 363, 393, 363, 393, 363, 198, 368, + 69, 368, 364, 367, 369, 366, 357, 358, + 359, 360, 361, 363, 198, 394, 69, 394, + 187, 396, 184, 395, 395, 395, 395, 174, + 394, 69, 394, 187, 396, 184, 174, 214, + 69, 214, 215, 128, 213, 402, 69, 402, + 404, 405, 128, 406, 397, 398, 399, 400, + 401, 403, 174, 186, 69, 186, 187, 184, + 403, 174, 186, 69, 186, 187, 184, 397, + 174, 186, 69, 186, 187, 184, 398, 174, + 186, 69, 186, 187, 184, 399, 174, 186, + 69, 186, 187, 184, 400, 174, 194, 69, + 194, 187, 195, 184, 174, 187, 69, 187, + 407, 408, 407, 407, 405, 403, 190, 37, + 406, 407, 397, 398, 399, 400, 401, 403, + 407, 403, 409, 403, 407, 409, 403, 174, + 410, 69, 410, 411, 404, 411, 411, 405, + 403, 128, 406, 411, 397, 398, 399, 400, + 401, 403, 411, 403, 411, 403, 411, 403, + 174, 194, 69, 194, 411, 404, 411, 411, + 405, 403, 195, 128, 406, 411, 397, 398, + 399, 400, 401, 403, 411, 403, 411, 403, + 411, 403, 174, 402, 69, 402, 405, 128, + 403, 403, 174, 194, 69, 194, 404, 405, + 195, 128, 406, 397, 398, 399, 400, 401, + 403, 174, 412, 69, 412, 404, 405, 403, + 414, 128, 406, 397, 398, 399, 400, 401, + 403, 413, 403, 413, 403, 413, 403, 174, + 412, 69, 412, 404, 405, 414, 128, 406, + 397, 398, 399, 400, 401, 403, 174, 420, + 69, 420, 422, 423, 184, 424, 415, 416, + 417, 418, 419, 421, 174, 186, 69, 186, + 187, 184, 421, 174, 420, 69, 420, 422, + 425, 184, 424, 415, 416, 417, 418, 419, + 421, 174, 186, 69, 186, 187, 184, 415, + 174, 186, 69, 186, 187, 184, 416, 174, + 186, 69, 186, 187, 184, 417, 174, 186, + 69, 186, 187, 184, 418, 174, 426, 69, + 426, 187, 427, 184, 174, 428, 69, 428, + 187, 429, 184, 174, 186, 69, 186, 187, + 184, 430, 430, 174, 431, 69, 431, 187, + 244, 184, 432, 432, 432, 432, 174, 431, + 69, 431, 187, 244, 184, 174, 187, 69, + 187, 433, 408, 433, 433, 425, 421, 190, + 68, 424, 433, 415, 416, 417, 418, 419, + 421, 433, 421, 434, 421, 433, 434, 421, + 174, 435, 69, 435, 436, 422, 436, 436, + 425, 421, 184, 424, 436, 415, 416, 417, + 418, 419, 421, 436, 421, 436, 421, 436, + 421, 174, 194, 69, 194, 436, 422, 436, + 436, 425, 421, 195, 184, 424, 436, 415, + 416, 417, 418, 419, 421, 436, 421, 436, + 421, 436, 421, 174, 420, 69, 420, 425, + 184, 421, 421, 174, 437, 69, 437, 422, + 425, 421, 414, 184, 424, 415, 416, 417, + 418, 419, 421, 438, 421, 438, 421, 438, + 421, 174, 437, 69, 437, 422, 425, 414, + 184, 424, 415, 416, 417, 418, 419, 421, + 174, 439, 69, 439, 440, 441, 440, 440, + 425, 421, 429, 68, 424, 440, 415, 416, + 417, 418, 419, 421, 440, 421, 434, 421, + 440, 434, 421, 174, 439, 69, 439, 442, + 443, 442, 442, 187, 429, 184, 442, 442, + 442, 191, 442, 191, 174, 444, 69, 444, + 445, 445, 445, 187, 184, 445, 445, 445, + 445, 445, 174, 426, 69, 426, 445, 445, + 445, 187, 427, 184, 445, 445, 445, 445, + 445, 174, 446, 69, 446, 187, 448, 184, + 447, 447, 447, 447, 174, 446, 69, 446, + 187, 448, 184, 174, 186, 69, 186, 439, + 184, 174, 449, 69, 449, 450, 422, 450, + 450, 425, 421, 184, 424, 450, 415, 416, + 417, 418, 419, 421, 450, 421, 450, 421, + 450, 421, 174, 426, 69, 426, 450, 422, + 450, 450, 425, 421, 427, 184, 424, 450, + 415, 416, 417, 418, 419, 421, 450, 421, + 450, 421, 450, 421, 174, 426, 69, 426, + 422, 425, 427, 184, 424, 415, 416, 417, + 418, 419, 421, 174, 186, 69, 186, 187, + 184, 181, 174, 180, 69, 180, 182, 451, + 184, 185, 175, 176, 177, 178, 179, 181, + 174, 186, 69, 186, 187, 184, 175, 174, + 186, 69, 186, 187, 184, 176, 174, 186, + 69, 186, 187, 184, 177, 174, 186, 69, + 186, 187, 184, 178, 174, 452, 69, 452, + 187, 453, 184, 174, 454, 69, 454, 187, + 455, 184, 174, 186, 69, 186, 187, 184, + 456, 456, 174, 187, 69, 187, 457, 458, + 457, 457, 451, 181, 190, 184, 185, 457, + 175, 176, 177, 178, 179, 181, 457, 181, + 459, 181, 457, 459, 181, 174, 460, 69, + 460, 461, 182, 461, 461, 451, 181, 184, + 185, 461, 175, 176, 177, 178, 179, 181, + 461, 181, 461, 181, 461, 181, 174, 194, + 69, 194, 461, 182, 461, 461, 451, 181, + 195, 184, 185, 461, 175, 176, 177, 178, + 179, 181, 461, 181, 461, 181, 461, 181, + 174, 180, 69, 180, 451, 184, 181, 181, + 174, 152, 69, 152, 404, 405, 153, 128, + 406, 397, 398, 399, 400, 401, 403, 174, + 462, 69, 462, 182, 451, 181, 464, 184, + 185, 175, 176, 177, 178, 179, 181, 463, + 181, 463, 181, 463, 181, 174, 462, 69, + 462, 182, 451, 464, 184, 185, 175, 176, + 177, 178, 179, 181, 174, 180, 69, 180, + 182, 465, 184, 185, 175, 176, 177, 178, + 179, 181, 174, 439, 69, 439, 466, 467, + 466, 466, 451, 181, 429, 184, 185, 466, + 175, 176, 177, 178, 179, 181, 466, 181, + 459, 181, 466, 459, 181, 174, 468, 69, + 468, 469, 182, 469, 469, 451, 181, 184, + 185, 469, 175, 176, 177, 178, 179, 181, + 469, 181, 469, 181, 469, 181, 174, 426, + 69, 426, 469, 182, 469, 469, 451, 181, + 427, 184, 185, 469, 175, 176, 177, 178, + 179, 181, 469, 181, 469, 181, 469, 181, + 174, 452, 69, 452, 422, 425, 453, 184, + 424, 415, 416, 417, 418, 419, 421, 174, + 470, 69, 470, 471, 472, 471, 471, 451, + 181, 455, 184, 185, 471, 175, 176, 177, + 178, 179, 181, 471, 181, 459, 181, 471, + 459, 181, 174, 470, 69, 470, 473, 474, + 473, 473, 187, 455, 184, 473, 473, 473, + 191, 473, 191, 174, 475, 69, 475, 476, + 476, 476, 187, 184, 476, 476, 476, 476, + 476, 174, 452, 69, 452, 476, 476, 476, + 187, 453, 184, 476, 476, 476, 476, 476, + 174, 477, 69, 477, 478, 182, 478, 478, + 451, 181, 184, 185, 478, 175, 176, 177, + 178, 179, 181, 478, 181, 478, 181, 478, + 181, 174, 452, 69, 452, 478, 182, 478, + 478, 451, 181, 453, 184, 185, 478, 175, + 176, 177, 178, 179, 181, 478, 181, 478, + 181, 478, 181, 174, 452, 69, 452, 182, + 451, 453, 184, 185, 175, 176, 177, 178, + 179, 181, 174, 479, 69, 479, 145, 481, + 128, 480, 480, 480, 480, 143, 479, 69, + 479, 145, 481, 128, 143, 186, 69, 186, + 470, 184, 174, 487, 69, 487, 489, 490, + 491, 482, 483, 484, 485, 486, 488, 127, + 128, 69, 128, 129, 488, 127, 128, 69, + 128, 129, 482, 127, 128, 69, 128, 129, + 483, 127, 128, 69, 128, 129, 484, 127, + 128, 69, 128, 129, 485, 127, 136, 69, + 136, 129, 137, 127, 129, 69, 129, 492, + 493, 492, 492, 490, 488, 132, 491, 492, + 482, 483, 484, 485, 486, 488, 492, 488, + 494, 488, 492, 494, 488, 127, 495, 69, + 495, 496, 489, 496, 496, 490, 488, 491, + 496, 482, 483, 484, 485, 486, 488, 496, + 488, 496, 488, 496, 488, 127, 136, 69, + 136, 496, 489, 496, 496, 490, 488, 137, + 491, 496, 482, 483, 484, 485, 486, 488, + 496, 488, 496, 488, 496, 488, 127, 487, + 69, 487, 490, 488, 488, 127, 136, 69, + 136, 489, 490, 137, 491, 482, 483, 484, + 485, 486, 488, 127, 497, 69, 497, 489, + 490, 488, 499, 491, 482, 483, 484, 485, + 486, 488, 498, 488, 498, 488, 498, 488, + 127, 497, 69, 497, 489, 490, 499, 491, + 482, 483, 484, 485, 486, 488, 127, 505, + 69, 505, 507, 508, 509, 500, 501, 502, + 503, 504, 506, 198, 184, 69, 184, 199, + 506, 198, 505, 69, 505, 507, 510, 509, + 500, 501, 502, 503, 504, 506, 198, 184, + 69, 184, 199, 500, 198, 184, 69, 184, + 199, 501, 198, 184, 69, 184, 199, 502, + 198, 184, 69, 184, 199, 503, 198, 511, + 69, 511, 199, 512, 198, 513, 69, 513, + 199, 514, 198, 184, 69, 184, 199, 515, + 515, 198, 516, 69, 516, 199, 518, 517, + 517, 517, 517, 198, 516, 69, 516, 199, + 518, 198, 186, 69, 186, 187, 174, 199, + 69, 199, 519, 520, 519, 519, 510, 506, + 202, 509, 519, 500, 501, 502, 503, 504, + 506, 519, 506, 521, 506, 519, 521, 506, + 198, 522, 69, 522, 523, 507, 523, 523, + 510, 506, 509, 523, 500, 501, 502, 503, + 504, 506, 523, 506, 523, 506, 523, 506, + 198, 206, 69, 206, 523, 507, 523, 523, + 510, 506, 207, 509, 523, 500, 501, 502, + 503, 504, 506, 523, 506, 523, 506, 523, + 506, 198, 505, 69, 505, 510, 506, 506, + 198, 136, 69, 136, 346, 347, 137, 348, + 339, 340, 341, 342, 343, 345, 198, 524, + 69, 524, 507, 510, 506, 526, 509, 500, + 501, 502, 503, 504, 506, 525, 506, 525, + 506, 525, 506, 198, 524, 69, 524, 507, + 510, 526, 509, 500, 501, 502, 503, 504, + 506, 198, 505, 69, 505, 507, 527, 509, + 500, 501, 502, 503, 504, 506, 198, 382, + 69, 382, 528, 529, 528, 528, 510, 506, + 371, 509, 528, 500, 501, 502, 503, 504, + 506, 528, 506, 521, 506, 528, 521, 506, + 198, 530, 69, 530, 531, 507, 531, 531, + 510, 506, 509, 531, 500, 501, 502, 503, + 504, 506, 531, 506, 531, 506, 531, 506, + 198, 368, 69, 368, 531, 507, 531, 531, + 510, 506, 369, 509, 531, 500, 501, 502, + 503, 504, 506, 531, 506, 531, 506, 531, + 506, 198, 511, 69, 511, 364, 367, 512, + 366, 357, 358, 359, 360, 361, 363, 198, + 532, 69, 532, 533, 534, 533, 533, 510, + 506, 514, 509, 533, 500, 501, 502, 503, + 504, 506, 533, 506, 521, 506, 533, 521, + 506, 198, 532, 69, 532, 535, 536, 535, + 535, 199, 514, 535, 535, 535, 203, 535, + 203, 198, 537, 69, 537, 538, 538, 538, + 199, 538, 538, 538, 538, 538, 198, 511, + 69, 511, 538, 538, 538, 199, 512, 538, + 538, 538, 538, 538, 198, 539, 69, 539, + 540, 507, 540, 540, 510, 506, 509, 540, + 500, 501, 502, 503, 504, 506, 540, 506, + 540, 506, 540, 506, 198, 511, 69, 511, + 540, 507, 540, 540, 510, 506, 512, 509, + 540, 500, 501, 502, 503, 504, 506, 540, + 506, 540, 506, 540, 506, 198, 511, 69, + 511, 507, 510, 512, 509, 500, 501, 502, + 503, 504, 506, 198, 541, 69, 541, 129, + 543, 542, 542, 542, 542, 127, 541, 69, + 541, 129, 543, 127, 184, 69, 184, 532, + 198, 1, 0 }; static const short _tsip_machine_parser_header_P_Preferred_Identity_trans_targs[] = { 2, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 40, - 45, 29, 126, 24, 25, 26, 27, 28, + 45, 29, 97, 24, 25, 26, 27, 28, 30, 31, 30, 32, 33, 34, 34, 35, - 36, 540, 37, 55, 38, 39, 41, 43, + 36, 405, 37, 55, 38, 39, 41, 43, 40, 42, 26, 29, 42, 44, 46, 47, 48, 49, 50, 45, 51, 53, 54, 52, 56, 55, 57, 58, 58, 35, 59, 60, - 114, 63, 58, 61, 60, 62, 63, 62, + 85, 63, 58, 61, 60, 62, 63, 62, 64, 65, 64, 66, 67, 67, 68, 69, 73, 72, 67, 70, 69, 71, 72, 71, 74, 75, 76, 77, 78, 73, 73, 79, - 80, 109, 81, 107, 110, 88, 111, 82, - 89, 94, 104, 83, 84, 85, 86, 87, - 33, 90, 92, 89, 91, 85, 88, 91, - 93, 95, 96, 97, 98, 99, 94, 100, - 102, 103, 101, 105, 104, 106, 108, 107, - 112, 111, 113, 115, 116, 117, 118, 119, - 114, 114, 120, 121, 124, 122, 125, 123, - 122, 127, 126, 128, 129, 129, 130, 131, - 495, 134, 534, 132, 131, 133, 134, 133, - 135, 136, 135, 137, 138, 138, 139, 140, - 144, 143, 489, 141, 140, 142, 143, 142, - 138, 145, 146, 147, 148, 149, 144, 144, - 150, 151, 244, 152, 242, 245, 246, 153, - 156, 154, 155, 157, 156, 158, 159, 165, - 159, 160, 161, 230, 164, 159, 162, 161, - 163, 164, 163, 227, 166, 167, 202, 170, - 213, 168, 167, 169, 170, 169, 171, 172, - 171, 173, 174, 174, 175, 176, 180, 179, - 174, 177, 176, 178, 179, 178, 181, 182, - 183, 184, 185, 180, 180, 186, 187, 197, - 188, 195, 198, 199, 189, 192, 190, 191, - 193, 192, 194, 196, 195, 200, 199, 201, - 203, 204, 205, 206, 207, 202, 202, 208, - 209, 212, 210, 211, 210, 214, 213, 215, - 216, 217, 218, 219, 220, 221, 222, 217, - 217, 223, 226, 224, 225, 224, 228, 227, - 229, 231, 232, 233, 234, 235, 230, 230, - 236, 237, 240, 238, 241, 239, 238, 243, - 242, 247, 246, 248, 249, 468, 470, 471, - 472, 473, 469, 469, 474, 485, 480, 249, - 250, 255, 251, 401, 254, 462, 252, 251, - 253, 254, 253, 398, 255, 256, 257, 361, - 260, 394, 258, 257, 259, 260, 259, 261, - 262, 261, 263, 264, 264, 265, 266, 270, - 269, 357, 267, 266, 268, 269, 268, 264, - 271, 272, 273, 274, 275, 270, 270, 276, - 277, 280, 278, 281, 282, 279, 278, 283, - 282, 284, 285, 287, 288, 289, 290, 286, - 286, 354, 348, 291, 292, 346, 349, 293, - 303, 294, 295, 296, 297, 298, 293, 293, - 299, 302, 300, 301, 300, 304, 303, 305, - 306, 307, 308, 309, 310, 311, 312, 307, - 307, 313, 345, 314, 343, 342, 315, 328, - 316, 317, 318, 319, 320, 315, 315, 321, - 324, 322, 325, 323, 322, 326, 325, 327, - 329, 328, 330, 331, 332, 333, 334, 335, - 336, 337, 332, 332, 338, 341, 339, 340, - 339, 344, 343, 347, 346, 350, 349, 351, - 352, 353, 355, 356, 355, 358, 357, 359, - 360, 286, 362, 363, 364, 365, 366, 361, - 361, 367, 368, 371, 369, 372, 373, 370, - 369, 374, 373, 375, 376, 378, 379, 380, - 381, 377, 377, 391, 385, 382, 383, 386, - 384, 383, 387, 386, 388, 389, 390, 392, - 393, 392, 395, 394, 396, 397, 377, 399, - 398, 400, 402, 403, 404, 405, 406, 401, - 401, 407, 408, 411, 409, 412, 413, 410, - 409, 414, 413, 415, 416, 418, 419, 420, - 421, 417, 417, 422, 459, 453, 427, 423, - 424, 423, 424, 425, 426, 425, 428, 451, - 454, 429, 430, 429, 431, 432, 433, 439, - 436, 434, 433, 435, 436, 435, 437, 438, - 437, 440, 441, 442, 443, 444, 439, 439, - 445, 446, 449, 447, 450, 448, 447, 452, - 451, 455, 454, 456, 457, 458, 460, 461, - 460, 463, 462, 464, 465, 466, 417, 467, - 466, 477, 475, 476, 475, 476, 249, 478, - 481, 479, 478, 482, 481, 483, 484, 486, - 488, 487, 486, 490, 489, 491, 492, 493, - 469, 494, 493, 496, 497, 498, 499, 500, - 495, 495, 501, 502, 505, 503, 506, 507, - 504, 503, 508, 507, 509, 510, 512, 513, - 514, 515, 511, 511, 516, 530, 525, 522, - 517, 518, 517, 518, 519, 520, 519, 521, - 523, 526, 524, 523, 527, 526, 528, 529, - 531, 533, 532, 531, 535, 534, 536, 537, - 538, 511, 539, 538 + 80, 83, 81, 84, 82, 81, 86, 87, + 88, 89, 90, 85, 85, 91, 92, 95, + 93, 96, 94, 93, 98, 97, 99, 100, + 100, 101, 102, 356, 105, 402, 103, 102, + 104, 105, 104, 106, 107, 106, 108, 109, + 109, 110, 111, 115, 114, 353, 112, 111, + 113, 114, 113, 109, 116, 117, 118, 119, + 120, 115, 115, 121, 122, 125, 123, 126, + 127, 124, 123, 128, 127, 129, 130, 325, + 327, 328, 329, 330, 326, 326, 331, 346, + 136, 337, 130, 131, 132, 283, 135, 319, + 133, 132, 134, 135, 134, 280, 136, 137, + 138, 237, 141, 274, 139, 138, 140, 141, + 140, 142, 143, 142, 144, 145, 145, 146, + 147, 151, 150, 234, 148, 147, 149, 150, + 149, 145, 152, 153, 154, 155, 156, 151, + 151, 157, 158, 161, 159, 162, 163, 160, + 159, 164, 163, 165, 166, 214, 216, 217, + 218, 219, 215, 215, 195, 231, 223, 166, + 167, 168, 174, 171, 208, 169, 168, 170, + 171, 170, 172, 173, 172, 175, 176, 177, + 178, 179, 174, 174, 180, 181, 184, 182, + 185, 186, 183, 182, 187, 186, 188, 189, + 191, 192, 193, 194, 190, 190, 204, 201, + 198, 196, 197, 196, 197, 166, 199, 202, + 200, 199, 203, 202, 205, 211, 213, 206, + 190, 207, 206, 209, 208, 210, 212, 211, + 220, 221, 224, 225, 222, 221, 226, 225, + 227, 228, 229, 230, 229, 232, 233, 215, + 235, 234, 236, 238, 239, 240, 241, 242, + 237, 237, 243, 244, 247, 245, 248, 249, + 246, 245, 250, 249, 251, 252, 254, 255, + 256, 257, 253, 253, 258, 270, 267, 264, + 259, 260, 259, 260, 261, 262, 261, 263, + 265, 268, 266, 265, 269, 268, 271, 277, + 279, 272, 253, 273, 272, 275, 274, 276, + 278, 277, 281, 280, 282, 284, 285, 286, + 287, 288, 283, 283, 289, 290, 293, 291, + 294, 295, 292, 291, 296, 295, 297, 298, + 300, 301, 302, 303, 299, 299, 304, 315, + 312, 309, 305, 306, 305, 306, 307, 308, + 307, 310, 313, 311, 310, 314, 313, 316, + 322, 324, 317, 299, 318, 317, 320, 319, + 321, 323, 322, 334, 332, 333, 332, 333, + 130, 335, 338, 339, 336, 335, 340, 339, + 341, 342, 343, 345, 344, 343, 347, 350, + 352, 348, 326, 349, 348, 351, 350, 354, + 353, 355, 357, 358, 359, 360, 361, 356, + 356, 362, 363, 366, 364, 367, 368, 365, + 364, 369, 368, 370, 371, 373, 374, 375, + 376, 372, 372, 377, 395, 386, 383, 378, + 379, 378, 379, 380, 381, 380, 382, 384, + 387, 388, 385, 384, 389, 388, 390, 391, + 392, 394, 393, 392, 396, 399, 401, 397, + 372, 398, 397, 400, 399, 403, 402, 404 }; static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_actions[] = { @@ -2244,87 +1760,65 @@ static const char _tsip_machine_parser_header_P_Preferred_Identity_trans_actions 1, 3, 0, 0, 0, 3, 3, 1, 1, 0, 1, 3, 0, 12, 5, 3, 0, 0, 0, 0, 0, 3, 0, 0, - 3, 0, 0, 1, 1, 0, 1, 0, - 1, 1, 1, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 5, 5, 5, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 3, 0, 1, 1, 3, - 0, 0, 0, 0, 0, 3, 3, 1, - 1, 0, 1, 3, 0, 9, 5, 3, - 1, 3, 0, 0, 0, 3, 3, 1, - 1, 0, 1, 3, 0, 9, 5, 3, - 1, 0, 0, 0, 0, 0, 3, 0, - 0, 3, 0, 0, 1, 1, 1, 0, - 1, 0, 0, 0, 0, 0, 0, 3, - 3, 3, 1, 1, 0, 1, 3, 0, - 12, 5, 3, 1, 3, 1, 1, 0, - 1, 3, 0, 12, 5, 3, 1, 3, - 0, 0, 0, 3, 3, 1, 1, 0, - 1, 3, 0, 12, 5, 3, 0, 0, + 3, 0, 1, 1, 3, 0, 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, - 0, 1, 1, 1, 0, 1, 0, 0, - 0, 0, 0, 3, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 3, 0, 0, - 3, 0, 1, 3, 0, 3, 0, 0, + 1, 1, 3, 0, 0, 0, 0, 0, + 3, 3, 1, 1, 0, 1, 3, 0, + 9, 5, 3, 1, 3, 0, 0, 0, + 3, 3, 1, 1, 0, 1, 3, 0, + 9, 5, 3, 1, 0, 0, 0, 0, + 0, 3, 0, 0, 3, 0, 1, 1, + 1, 3, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 3, + 3, 0, 3, 3, 1, 1, 0, 1, + 3, 0, 9, 5, 3, 1, 0, 3, + 1, 1, 0, 1, 3, 0, 9, 5, + 3, 1, 3, 0, 0, 0, 3, 3, + 1, 1, 0, 1, 3, 0, 9, 5, 3, 1, 0, 0, 0, 0, 0, 3, - 0, 3, 0, 1, 3, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 3, 0, 1, 1, 3, 0, 3, + 0, 0, 3, 0, 1, 1, 1, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 3, - 3, 3, 1, 1, 0, 1, 3, 0, - 9, 5, 3, 1, 0, 3, 1, 1, - 0, 1, 3, 0, 9, 5, 3, 1, - 3, 0, 0, 0, 3, 3, 1, 1, - 0, 1, 3, 0, 9, 5, 3, 1, - 0, 0, 0, 0, 0, 3, 0, 0, - 3, 0, 1, 1, 1, 3, 0, 3, - 0, 0, 0, 0, 0, 0, 0, 3, - 0, 3, 0, 3, 3, 1, 1, 1, - 1, 0, 0, 0, 0, 0, 3, 0, - 3, 0, 1, 3, 0, 3, 0, 0, - 3, 1, 0, 0, 0, 0, 0, 3, - 0, 3, 0, 3, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 3, 0, 3, - 0, 1, 1, 3, 0, 3, 0, 0, - 3, 0, 0, 3, 1, 0, 0, 0, - 0, 0, 3, 0, 3, 0, 1, 3, - 0, 3, 0, 3, 0, 3, 0, 0, - 3, 1, 1, 3, 0, 3, 0, 0, - 3, 1, 0, 0, 0, 0, 0, 3, - 0, 0, 3, 0, 1, 1, 1, 3, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 3, 0, 3, 1, 1, - 3, 0, 3, 0, 0, 3, 1, 1, - 3, 0, 3, 0, 0, 3, 1, 3, - 0, 0, 0, 0, 0, 0, 0, 3, - 0, 0, 3, 0, 1, 1, 1, 3, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 3, 0, 3, 9, - 5, 3, 0, 1, 3, 0, 3, 1, - 1, 1, 3, 0, 0, 3, 1, 1, - 0, 3, 0, 12, 5, 3, 1, 3, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 3, 0, 1, 1, 3, 0, 3, - 0, 3, 0, 0, 3, 1, 1, 3, - 0, 3, 0, 0, 3, 1, 1, 3, - 0, 3, 9, 5, 3, 0, 1, 1, - 1, 3, 0, 3, 0, 0, 3, 1, - 1, 3, 0, 3, 0, 0, 3, 1, - 1, 3, 0, 0, 0, 0, 0, 0, + 3, 1, 1, 0, 1, 3, 0, 9, + 5, 3, 1, 3, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 3, 0, 1, + 1, 1, 3, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 3, 0, + 3, 9, 5, 3, 0, 1, 1, 1, + 3, 0, 3, 0, 3, 1, 1, 1, + 1, 3, 0, 3, 0, 0, 3, 0, + 3, 1, 1, 1, 3, 0, 3, 0, + 0, 3, 1, 3, 0, 3, 1, 1, + 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 1, 1, 1, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 3, 9, 5, 3, 0, 1, 3, 0, 0, + 1, 1, 3, 0, 3, 0, 3, 1, + 1, 1, 1, 3, 0, 3, 0, 0, + 3, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 3, 0, 1, + 1, 1, 3, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 3, + 0, 3, 9, 5, 3, 0, 1, 3, + 0, 1, 1, 3, 0, 3, 0, 3, + 1, 1, 1, 1, 3, 0, 3, 0, + 0, 3, 0, 3, 9, 5, 3, 0, + 1, 1, 1, 1, 3, 0, 3, 0, + 0, 3, 1, 1, 3, 0, 3, 1, + 1, 1, 1, 3, 0, 3, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 3, 0, 1, 1, 1, 3, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 3, 0, 3, 9, + 5, 3, 0, 1, 3, 0, 0, 1, 1, 1, 3, 0, 3, 0, 0, 3, - 1, 1, 3, 0, 3, 0, 0, 3, - 1, 1, 3, 0 + 1, 1, 3, 0, 3, 1, 1, 1, + 1, 3, 0, 3, 0, 3, 0, 0 }; static const int tsip_machine_parser_header_P_Preferred_Identity_start = 1; -static const int tsip_machine_parser_header_P_Preferred_Identity_first_final = 540; +static const int tsip_machine_parser_header_P_Preferred_Identity_first_final = 405; static const int tsip_machine_parser_header_P_Preferred_Identity_error = 0; static const int tsip_machine_parser_header_P_Preferred_Identity_en_main = 1; @@ -2332,14 +1826,14 @@ static const int tsip_machine_parser_header_P_Preferred_Identity_en_main = 1; /* #line 124 "tsip_parser_header_P_Preferred_Identity.rl" */ -/* #line 2336 "../src/headers/tsip_header_P_Preferred_Identity.c" */ +/* #line 1830 "../src/headers/tsip_header_P_Preferred_Identity.c" */ { cs = tsip_machine_parser_header_P_Preferred_Identity_start; } /* #line 125 "tsip_parser_header_P_Preferred_Identity.rl" */ -/* #line 2343 "../src/headers/tsip_header_P_Preferred_Identity.c" */ +/* #line 1837 "../src/headers/tsip_header_P_Preferred_Identity.c" */ { int _klen; unsigned int _trans; @@ -2444,7 +1938,7 @@ _match: { } break; -/* #line 2448 "../src/headers/tsip_header_P_Preferred_Identity.c" */ +/* #line 1942 "../src/headers/tsip_header_P_Preferred_Identity.c" */ } } @@ -2460,8 +1954,8 @@ _again: /* #line 126 "tsip_parser_header_P_Preferred_Identity.rl" */ if( cs < -/* #line 2464 "../src/headers/tsip_header_P_Preferred_Identity.c" */ -540 +/* #line 1958 "../src/headers/tsip_header_P_Preferred_Identity.c" */ +405 /* #line 127 "tsip_parser_header_P_Preferred_Identity.rl" */ ) { @@ -2481,8 +1975,6 @@ _again: // P_Preferred_Identity header object definition // -/**@ingroup tsip_header_P_Preferred_Identity_group -*/ static void* tsip_header_P_Preferred_Identity_create(void *self, va_list * app) { tsip_header_P_Preferred_Identity_t *P_Preferred_Identity = self; @@ -2504,8 +1996,6 @@ static void* tsip_header_P_Preferred_Identity_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_P_Preferred_Identity_group -*/ static void* tsip_header_P_Preferred_Identity_destroy(void *self) { tsip_header_P_Preferred_Identity_t *P_Preferred_Identity = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Path.c b/trunk/tinySIP/src/headers/tsip_header_Path.c index c05bc844..f2b72ee8 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Path.c +++ b/trunk/tinySIP/src/headers/tsip_header_Path.c @@ -503,8 +503,6 @@ _again: // Path header object definition // -/**@ingroup tsip_header_Path_group -*/ static void* tsip_header_Path_create(void *self, va_list * app) { tsip_header_Path_t *Path = self; @@ -525,8 +523,6 @@ static void* tsip_header_Path_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Path_group -*/ static void* tsip_header_Path_destroy(void *self) { tsip_header_Path_t *Path = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Privacy.c b/trunk/tinySIP/src/headers/tsip_header_Privacy.c index 1a4e9190..784f24e8 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Privacy.c +++ b/trunk/tinySIP/src/headers/tsip_header_Privacy.c @@ -450,8 +450,6 @@ _again: // Privacy header object definition // -/**@ingroup tsip_header_Privacy_group -*/ static void* tsip_header_Privacy_create(void *self, va_list * app) { tsip_header_Privacy_t *Privacy = self; @@ -467,8 +465,6 @@ static void* tsip_header_Privacy_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Privacy_group -*/ static void* tsip_header_Privacy_destroy(void *self) { tsip_header_Privacy_t *Privacy = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Proxy_Require.c b/trunk/tinySIP/src/headers/tsip_header_Proxy_Require.c index 16cce507..da92db00 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Proxy_Require.c +++ b/trunk/tinySIP/src/headers/tsip_header_Proxy_Require.c @@ -310,8 +310,6 @@ _again: // Proxy_Require header object definition // -/**@ingroup tsip_header_Proxy_Require_group -*/ static void* tsip_header_Proxy_Require_create(void *self, va_list * app) { tsip_header_Proxy_Require_t *Proxy_Require = self; @@ -336,8 +334,6 @@ static void* tsip_header_Proxy_Require_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Proxy_Require_group -*/ static void* tsip_header_Proxy_Require_destroy(void *self) { tsip_header_Proxy_Require_t *Proxy_Require = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Record_Route.c b/trunk/tinySIP/src/headers/tsip_header_Record_Route.c index 6e92ff3b..57a9c998 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Record_Route.c +++ b/trunk/tinySIP/src/headers/tsip_header_Record_Route.c @@ -276,8 +276,6 @@ _again: // Record_Route header object definition // -/**@ingroup tsip_header_Record_Route_group -*/ static void* tsip_header_Record_Route_create(void *self, va_list * app) { tsip_header_Record_Route_t *Record_Route = self; @@ -294,8 +292,6 @@ static void* tsip_header_Record_Route_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Record_Route_group -*/ static void* tsip_header_Record_Route_destroy(void *self) { tsip_header_Record_Route_t *Record_Route = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Require.c b/trunk/tinySIP/src/headers/tsip_header_Require.c index e938b229..1396fbe7 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Require.c +++ b/trunk/tinySIP/src/headers/tsip_header_Require.c @@ -300,8 +300,6 @@ _again: // Require header object definition // -/**@ingroup tsip_header_Require_group -*/ static void* tsip_header_Require_create(void *self, va_list * app) { tsip_header_Require_t *Require = self; @@ -326,8 +324,6 @@ static void* tsip_header_Require_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Require_group -*/ static void* tsip_header_Require_destroy(void *self) { tsip_header_Require_t *Require = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Route.c b/trunk/tinySIP/src/headers/tsip_header_Route.c index 2aaa1282..c52fd72a 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Route.c +++ b/trunk/tinySIP/src/headers/tsip_header_Route.c @@ -503,8 +503,6 @@ _again: // Route header object definition // -/**@ingroup tsip_header_Route_group -*/ static void* tsip_header_Route_create(void *self, va_list * app) { tsip_header_Route_t *Route = self; @@ -526,8 +524,6 @@ static void* tsip_header_Route_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Route_group -*/ static void* tsip_header_Route_destroy(void *self) { tsip_header_Route_t *Route = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_SIP_ETag.c b/trunk/tinySIP/src/headers/tsip_header_SIP_ETag.c index 8b137891..ea5c7813 100644 --- a/trunk/tinySIP/src/headers/tsip_header_SIP_ETag.c +++ b/trunk/tinySIP/src/headers/tsip_header_SIP_ETag.c @@ -1 +1,322 @@ - + +/* #line 1 "tsip_parser_header_SIP_ETag.rl" */ + +/* +* Copyright (C) 2009 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ + +/**@file tsip_header_SIP_ETag.c + * @brief SIP SIP-ETag header. + * + * @author Mamadou Diop + * + * @date Created: Sat Nov 8 16:54:58 2009 mdiop + */ +#include "tinysip/headers/tsip_header_SIP_ETag.h" + +#include "tinysip/parsers/tsip_parser_uri.h" + +#include "tsk_debug.h" +#include "tsk_memory.h" + +#include + +/**@defgroup tsip_header_SIP_ETag_group SIP SIP_ETag header. +*/ + +/*********************************** +* Ragel state machine. +*/ + +/* #line 71 "tsip_parser_header_SIP_ETag.rl" */ + + +int tsip_header_SIP_ETag_tostring(const void* header, tsk_buffer_t* output) +{ + if(header) + { + const tsip_header_SIP_ETag_t *SIP_ETag = header; + if(SIP_ETag->value){ + tsk_buffer_append(output, SIP_ETag->value, strlen(SIP_ETag->value)); + } + return 0; + } + + return -1; +} + +tsip_header_SIP_ETag_t *tsip_header_SIP_ETag_parse(const char *data, size_t size) +{ + int cs = 0; + const char *p = data; + const char *pe = p + size; + const char *eof = pe; + tsip_header_SIP_ETag_t *hdr_etag = TSIP_HEADER_SIP_ETAG_CREATE_NULL(); + + const char *tag_start; + + +/* #line 78 "../src/headers/tsip_header_SIP_ETag.c" */ +static const char _tsip_machine_parser_header_SIP_ETag_actions[] = { + 0, 1, 0, 1, 1, 1, 2 +}; + +static const char _tsip_machine_parser_header_SIP_ETag_key_offsets[] = { + 0, 0, 2, 4, 6, 7, 9, 11, + 13, 15, 18, 35, 36, 38, 54, 69, + 70 +}; + +static const char _tsip_machine_parser_header_SIP_ETag_trans_keys[] = { + 83, 115, 73, 105, 80, 112, 45, 69, + 101, 84, 116, 65, 97, 71, 103, 9, + 32, 58, 9, 13, 32, 33, 37, 39, + 126, 42, 43, 45, 46, 48, 57, 65, + 90, 95, 122, 10, 9, 32, 9, 32, + 33, 37, 39, 126, 42, 43, 45, 46, + 48, 57, 65, 90, 95, 122, 13, 33, + 37, 39, 126, 42, 43, 45, 46, 48, + 57, 65, 90, 95, 122, 10, 0 +}; + +static const char _tsip_machine_parser_header_SIP_ETag_single_lengths[] = { + 0, 2, 2, 2, 1, 2, 2, 2, + 2, 3, 7, 1, 2, 6, 5, 1, + 0 +}; + +static const char _tsip_machine_parser_header_SIP_ETag_range_lengths[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 5, 5, 0, + 0 +}; + +static const char _tsip_machine_parser_header_SIP_ETag_index_offsets[] = { + 0, 0, 3, 6, 9, 11, 14, 17, + 20, 23, 27, 40, 42, 45, 57, 68, + 70 +}; + +static const char _tsip_machine_parser_header_SIP_ETag_indicies[] = { + 0, 0, 1, 2, 2, 1, 3, 3, + 1, 4, 1, 5, 5, 1, 6, 6, + 1, 7, 7, 1, 8, 8, 1, 8, + 8, 9, 1, 9, 10, 9, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1, + 12, 1, 13, 13, 1, 13, 13, 11, + 11, 11, 11, 11, 11, 11, 11, 11, + 1, 14, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 1, 16, 1, 1, 0 +}; + +static const char _tsip_machine_parser_header_SIP_ETag_trans_targs[] = { + 2, 0, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 14, 12, 13, 15, 14, + 16 +}; + +static const char _tsip_machine_parser_header_SIP_ETag_trans_actions[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 3, 0, + 5 +}; + +static const int tsip_machine_parser_header_SIP_ETag_start = 1; +static const int tsip_machine_parser_header_SIP_ETag_first_final = 16; +static const int tsip_machine_parser_header_SIP_ETag_error = 0; + +static const int tsip_machine_parser_header_SIP_ETag_en_main = 1; + + +/* #line 98 "tsip_parser_header_SIP_ETag.rl" */ + +/* #line 152 "../src/headers/tsip_header_SIP_ETag.c" */ + { + cs = tsip_machine_parser_header_SIP_ETag_start; + } + +/* #line 99 "tsip_parser_header_SIP_ETag.rl" */ + +/* #line 159 "../src/headers/tsip_header_SIP_ETag.c" */ + { + int _klen; + unsigned int _trans; + const char *_acts; + unsigned int _nacts; + const char *_keys; + + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; +_resume: + _keys = _tsip_machine_parser_header_SIP_ETag_trans_keys + _tsip_machine_parser_header_SIP_ETag_key_offsets[cs]; + _trans = _tsip_machine_parser_header_SIP_ETag_index_offsets[cs]; + + _klen = _tsip_machine_parser_header_SIP_ETag_single_lengths[cs]; + if ( _klen > 0 ) { + const char *_lower = _keys; + const char *_mid; + const char *_upper = _keys + _klen - 1; + while (1) { + if ( _upper < _lower ) + break; + + _mid = _lower + ((_upper-_lower) >> 1); + if ( (*p) < *_mid ) + _upper = _mid - 1; + else if ( (*p) > *_mid ) + _lower = _mid + 1; + else { + _trans += (_mid - _keys); + goto _match; + } + } + _keys += _klen; + _trans += _klen; + } + + _klen = _tsip_machine_parser_header_SIP_ETag_range_lengths[cs]; + if ( _klen > 0 ) { + const char *_lower = _keys; + const char *_mid; + const char *_upper = _keys + (_klen<<1) - 2; + while (1) { + if ( _upper < _lower ) + break; + + _mid = _lower + (((_upper-_lower) >> 1) & ~1); + if ( (*p) < _mid[0] ) + _upper = _mid - 2; + else if ( (*p) > _mid[1] ) + _lower = _mid + 2; + else { + _trans += ((_mid - _keys)>>1); + goto _match; + } + } + _trans += _klen; + } + +_match: + _trans = _tsip_machine_parser_header_SIP_ETag_indicies[_trans]; + cs = _tsip_machine_parser_header_SIP_ETag_trans_targs[_trans]; + + if ( _tsip_machine_parser_header_SIP_ETag_trans_actions[_trans] == 0 ) + goto _again; + + _acts = _tsip_machine_parser_header_SIP_ETag_actions + _tsip_machine_parser_header_SIP_ETag_trans_actions[_trans]; + _nacts = (unsigned int) *_acts++; + while ( _nacts-- > 0 ) + { + switch ( *_acts++ ) + { + case 0: +/* #line 53 "tsip_parser_header_SIP_ETag.rl" */ + { + tag_start = p; + } + break; + case 1: +/* #line 58 "tsip_parser_header_SIP_ETag.rl" */ + { + TSK_PARSER_SET_STRING(hdr_etag->value); + } + break; + case 2: +/* #line 63 "tsip_parser_header_SIP_ETag.rl" */ + { + } + break; +/* #line 250 "../src/headers/tsip_header_SIP_ETag.c" */ + } + } + +_again: + if ( cs == 0 ) + goto _out; + if ( ++p != pe ) + goto _resume; + _test_eof: {} + _out: {} + } + +/* #line 100 "tsip_parser_header_SIP_ETag.rl" */ + + if( cs < +/* #line 266 "../src/headers/tsip_header_SIP_ETag.c" */ +16 +/* #line 101 "tsip_parser_header_SIP_ETag.rl" */ + ) + { + TSK_OBJECT_SAFE_FREE(hdr_etag); + } + + return hdr_etag; +} + + + + + + + +//======================================================== +// SIP_ETag header object definition +// + +static void* tsip_header_SIP_ETag_create(void *self, va_list * app) +{ + tsip_header_SIP_ETag_t *SIP_ETag = self; + if(SIP_ETag) + { + TSIP_HEADER(SIP_ETag)->type = tsip_htype_SIP_ETag; + TSIP_HEADER(SIP_ETag)->tostring = tsip_header_SIP_ETag_tostring; + SIP_ETag->value = tsk_strdup(va_arg(*app, const char*)); + } + else + { + TSK_DEBUG_ERROR("Failed to create new SIP_ETag header."); + } + return self; +} + +static void* tsip_header_SIP_ETag_destroy(void *self) +{ + tsip_header_SIP_ETag_t *SIP_ETag = self; + if(SIP_ETag) + { + TSK_FREE(SIP_ETag->value); + TSK_OBJECT_SAFE_FREE(TSIP_HEADER_PARAMS(SIP_ETag)); + } + else TSK_DEBUG_ERROR("Null SIP_ETag header."); + + return self; +} + +static const tsk_object_def_t tsip_header_SIP_ETag_def_s = +{ + sizeof(tsip_header_SIP_ETag_t), + tsip_header_SIP_ETag_create, + tsip_header_SIP_ETag_destroy, + 0 +}; +const void *tsip_header_SIP_ETag_def_t = &tsip_header_SIP_ETag_def_s; diff --git a/trunk/tinySIP/src/headers/tsip_header_SIP_If_Match.c b/trunk/tinySIP/src/headers/tsip_header_SIP_If_Match.c index 8b137891..a064a4d3 100644 --- a/trunk/tinySIP/src/headers/tsip_header_SIP_If_Match.c +++ b/trunk/tinySIP/src/headers/tsip_header_SIP_If_Match.c @@ -1 +1,326 @@ - + +/* #line 1 "tsip_parser_header_SIP_If_Match.rl" */ + +/* +* Copyright (C) 2009 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ + +/**@file tsip_header_SIP_If_Match.c + * @brief SIP SIP-If-Match header. + * + * @author Mamadou Diop + * + * @date Created: Sat Nov 8 16:54:58 2009 mdiop + */ +#include "tinysip/headers/tsip_header_SIP_If_Match.h" + +#include "tinysip/parsers/tsip_parser_uri.h" + +#include "tsk_debug.h" +#include "tsk_memory.h" + +#include + +/**@defgroup tsip_header_SIP_If_Match_group SIP SIP_If_Match header. +*/ + +/*********************************** +* Ragel state machine. +*/ + +/* #line 71 "tsip_parser_header_SIP_If_Match.rl" */ + + +int tsip_header_SIP_If_Match_tostring(const void* header, tsk_buffer_t* output) +{ + if(header) + { + const tsip_header_SIP_If_Match_t *SIP_If_Match = header; + if(SIP_If_Match->value){ + tsk_buffer_append(output, SIP_If_Match->value, strlen(SIP_If_Match->value)); + } + return 0; + } + + return -1; +} + +tsip_header_SIP_If_Match_t *tsip_header_SIP_If_Match_parse(const char *data, size_t size) +{ + int cs = 0; + const char *p = data; + const char *pe = p + size; + const char *eof = pe; + tsip_header_SIP_If_Match_t *hdr_ifmatch = TSIP_HEADER_SIP_IF_MATCH_CREATE_NULL(); + + const char *tag_start; + + +/* #line 78 "../src/headers/tsip_header_SIP_If_Match.c" */ +static const char _tsip_machine_parser_header_SIP_If_Match_actions[] = { + 0, 1, 0, 1, 1, 1, 2 +}; + +static const char _tsip_machine_parser_header_SIP_If_Match_key_offsets[] = { + 0, 0, 2, 4, 6, 7, 9, 11, + 12, 14, 16, 18, 20, 22, 25, 42, + 43, 45, 61, 76, 77 +}; + +static const char _tsip_machine_parser_header_SIP_If_Match_trans_keys[] = { + 83, 115, 73, 105, 80, 112, 45, 73, + 105, 70, 102, 45, 77, 109, 65, 97, + 84, 116, 67, 99, 72, 104, 9, 32, + 58, 9, 13, 32, 33, 37, 39, 126, + 42, 43, 45, 46, 48, 57, 65, 90, + 95, 122, 10, 9, 32, 9, 32, 33, + 37, 39, 126, 42, 43, 45, 46, 48, + 57, 65, 90, 95, 122, 13, 33, 37, + 39, 126, 42, 43, 45, 46, 48, 57, + 65, 90, 95, 122, 10, 0 +}; + +static const char _tsip_machine_parser_header_SIP_If_Match_single_lengths[] = { + 0, 2, 2, 2, 1, 2, 2, 1, + 2, 2, 2, 2, 2, 3, 7, 1, + 2, 6, 5, 1, 0 +}; + +static const char _tsip_machine_parser_header_SIP_If_Match_range_lengths[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, + 0, 5, 5, 0, 0 +}; + +static const char _tsip_machine_parser_header_SIP_If_Match_index_offsets[] = { + 0, 0, 3, 6, 9, 11, 14, 17, + 19, 22, 25, 28, 31, 34, 38, 51, + 53, 56, 68, 79, 81 +}; + +static const char _tsip_machine_parser_header_SIP_If_Match_indicies[] = { + 0, 0, 1, 2, 2, 1, 3, 3, + 1, 4, 1, 5, 5, 1, 6, 6, + 1, 7, 1, 8, 8, 1, 9, 9, + 1, 10, 10, 1, 11, 11, 1, 12, + 12, 1, 12, 12, 13, 1, 13, 14, + 13, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 1, 16, 1, 17, 17, 1, + 17, 17, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 1, 18, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 1, 20, + 1, 1, 0 +}; + +static const char _tsip_machine_parser_header_SIP_If_Match_trans_targs[] = { + 2, 0, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 18, + 16, 17, 19, 18, 20 +}; + +static const char _tsip_machine_parser_header_SIP_If_Match_trans_actions[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 3, 0, 5 +}; + +static const int tsip_machine_parser_header_SIP_If_Match_start = 1; +static const int tsip_machine_parser_header_SIP_If_Match_first_final = 20; +static const int tsip_machine_parser_header_SIP_If_Match_error = 0; + +static const int tsip_machine_parser_header_SIP_If_Match_en_main = 1; + + +/* #line 98 "tsip_parser_header_SIP_If_Match.rl" */ + +/* #line 155 "../src/headers/tsip_header_SIP_If_Match.c" */ + { + cs = tsip_machine_parser_header_SIP_If_Match_start; + } + +/* #line 99 "tsip_parser_header_SIP_If_Match.rl" */ + +/* #line 162 "../src/headers/tsip_header_SIP_If_Match.c" */ + { + int _klen; + unsigned int _trans; + const char *_acts; + unsigned int _nacts; + const char *_keys; + + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; +_resume: + _keys = _tsip_machine_parser_header_SIP_If_Match_trans_keys + _tsip_machine_parser_header_SIP_If_Match_key_offsets[cs]; + _trans = _tsip_machine_parser_header_SIP_If_Match_index_offsets[cs]; + + _klen = _tsip_machine_parser_header_SIP_If_Match_single_lengths[cs]; + if ( _klen > 0 ) { + const char *_lower = _keys; + const char *_mid; + const char *_upper = _keys + _klen - 1; + while (1) { + if ( _upper < _lower ) + break; + + _mid = _lower + ((_upper-_lower) >> 1); + if ( (*p) < *_mid ) + _upper = _mid - 1; + else if ( (*p) > *_mid ) + _lower = _mid + 1; + else { + _trans += (_mid - _keys); + goto _match; + } + } + _keys += _klen; + _trans += _klen; + } + + _klen = _tsip_machine_parser_header_SIP_If_Match_range_lengths[cs]; + if ( _klen > 0 ) { + const char *_lower = _keys; + const char *_mid; + const char *_upper = _keys + (_klen<<1) - 2; + while (1) { + if ( _upper < _lower ) + break; + + _mid = _lower + (((_upper-_lower) >> 1) & ~1); + if ( (*p) < _mid[0] ) + _upper = _mid - 2; + else if ( (*p) > _mid[1] ) + _lower = _mid + 2; + else { + _trans += ((_mid - _keys)>>1); + goto _match; + } + } + _trans += _klen; + } + +_match: + _trans = _tsip_machine_parser_header_SIP_If_Match_indicies[_trans]; + cs = _tsip_machine_parser_header_SIP_If_Match_trans_targs[_trans]; + + if ( _tsip_machine_parser_header_SIP_If_Match_trans_actions[_trans] == 0 ) + goto _again; + + _acts = _tsip_machine_parser_header_SIP_If_Match_actions + _tsip_machine_parser_header_SIP_If_Match_trans_actions[_trans]; + _nacts = (unsigned int) *_acts++; + while ( _nacts-- > 0 ) + { + switch ( *_acts++ ) + { + case 0: +/* #line 53 "tsip_parser_header_SIP_If_Match.rl" */ + { + tag_start = p; + } + break; + case 1: +/* #line 58 "tsip_parser_header_SIP_If_Match.rl" */ + { + TSK_PARSER_SET_STRING(hdr_ifmatch->value); + } + break; + case 2: +/* #line 63 "tsip_parser_header_SIP_If_Match.rl" */ + { + } + break; +/* #line 253 "../src/headers/tsip_header_SIP_If_Match.c" */ + } + } + +_again: + if ( cs == 0 ) + goto _out; + if ( ++p != pe ) + goto _resume; + _test_eof: {} + _out: {} + } + +/* #line 100 "tsip_parser_header_SIP_If_Match.rl" */ + + if( cs < +/* #line 269 "../src/headers/tsip_header_SIP_If_Match.c" */ +20 +/* #line 101 "tsip_parser_header_SIP_If_Match.rl" */ + ) + { + TSK_OBJECT_SAFE_FREE(hdr_ifmatch); + } + + return hdr_ifmatch; +} + + + + + + + +//======================================================== +// SIP_If_Match header object definition +// + +static void* tsip_header_SIP_If_Match_create(void *self, va_list * app) +{ + tsip_header_SIP_If_Match_t *SIP_If_Match = self; + if(SIP_If_Match) + { + TSIP_HEADER(SIP_If_Match)->type = tsip_htype_SIP_If_Match; + TSIP_HEADER(SIP_If_Match)->tostring = tsip_header_SIP_If_Match_tostring; + SIP_If_Match->value = tsk_strdup(va_arg(*app, const char*)); + } + else + { + TSK_DEBUG_ERROR("Failed to create new SIP_If_Match header."); + } + return self; +} + +static void* tsip_header_SIP_If_Match_destroy(void *self) +{ + tsip_header_SIP_If_Match_t *SIP_If_Match = self; + if(SIP_If_Match) + { + TSK_FREE(SIP_If_Match->value); + TSK_OBJECT_SAFE_FREE(TSIP_HEADER_PARAMS(SIP_If_Match)); + } + else TSK_DEBUG_ERROR("Null SIP_If_Match header."); + + return self; +} + +static const tsk_object_def_t tsip_header_SIP_If_Match_def_s = +{ + sizeof(tsip_header_SIP_If_Match_t), + tsip_header_SIP_If_Match_create, + tsip_header_SIP_If_Match_destroy, + 0 +}; +const void *tsip_header_SIP_If_Match_def_t = &tsip_header_SIP_If_Match_def_s; + diff --git a/trunk/tinySIP/src/headers/tsip_header_Security_Client.c b/trunk/tinySIP/src/headers/tsip_header_Security_Client.c index d06e814b..6d31e4dd 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Security_Client.c +++ b/trunk/tinySIP/src/headers/tsip_header_Security_Client.c @@ -912,8 +912,6 @@ _again: // Security_Client header object definition // -/**@ingroup tsip_header_Security_Client_group -*/ static void* tsip_header_Security_Client_create(void *self, va_list * app) { tsip_header_Security_Client_t *Security_Client = self; @@ -950,8 +948,6 @@ static void* tsip_header_Security_Client_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Security_Client_group -*/ static void* tsip_header_Security_Client_destroy(void *self) { tsip_header_Security_Client_t *Security_Client = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Security_Server.c b/trunk/tinySIP/src/headers/tsip_header_Security_Server.c index e15a7dac..e1f806e0 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Security_Server.c +++ b/trunk/tinySIP/src/headers/tsip_header_Security_Server.c @@ -913,8 +913,6 @@ _again: // Security_Server header object definition // -/**@ingroup tsip_header_Security_Server_group -*/ static void* tsip_header_Security_Server_create(void *self, va_list * app) { tsip_header_Security_Server_t *Security_Server = self; @@ -933,8 +931,6 @@ static void* tsip_header_Security_Server_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Security_Server_group -*/ static void* tsip_header_Security_Server_destroy(void *self) { tsip_header_Security_Server_t *Security_Server = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Security_Verify.c b/trunk/tinySIP/src/headers/tsip_header_Security_Verify.c index 4c5eb0ce..4ea8cd2c 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Security_Verify.c +++ b/trunk/tinySIP/src/headers/tsip_header_Security_Verify.c @@ -912,8 +912,6 @@ _again: // Security_Verify header object definition // -/**@ingroup tsip_header_Security_Verify_group -*/ static void* tsip_header_Security_Verify_create(void *self, va_list * app) { tsip_header_Security_Verify_t *Security_Verify = self; @@ -932,8 +930,6 @@ static void* tsip_header_Security_Verify_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Security_Verify_group -*/ static void* tsip_header_Security_Verify_destroy(void *self) { tsip_header_Security_Verify_t *Security_Verify = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Server.c b/trunk/tinySIP/src/headers/tsip_header_Server.c index ae79e631..779abb95 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Server.c +++ b/trunk/tinySIP/src/headers/tsip_header_Server.c @@ -267,8 +267,6 @@ _again: // Server header object definition // -/**@ingroup tsip_header_Server_group -*/ static void* tsip_header_Server_create(void *self, va_list * app) { tsip_header_Server_t *Server = self; @@ -285,8 +283,6 @@ static void* tsip_header_Server_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Server_group -*/ static void* tsip_header_Server_destroy(void *self) { tsip_header_Server_t *Server = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Service_Route.c b/trunk/tinySIP/src/headers/tsip_header_Service_Route.c index f8edffa8..8eb9237f 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Service_Route.c +++ b/trunk/tinySIP/src/headers/tsip_header_Service_Route.c @@ -512,8 +512,6 @@ _again: // Service_Route header object definition // -/**@ingroup tsip_header_Service_Route_group -*/ static void* tsip_header_Service_Route_create(void *self, va_list * app) { tsip_header_Service_Route_t *Service_Route = self; @@ -534,8 +532,6 @@ static void* tsip_header_Service_Route_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Service_Route_group -*/ static void* tsip_header_Service_Route_destroy(void *self) { tsip_header_Service_Route_t *Service_Route = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Subscription_State.c b/trunk/tinySIP/src/headers/tsip_header_Subscription_State.c index e54eddc6..f3f8f06f 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Subscription_State.c +++ b/trunk/tinySIP/src/headers/tsip_header_Subscription_State.c @@ -655,8 +655,6 @@ _again: // Subscription_State header object definition // -/**@ingroup tsip_header_Subscription_State_group -*/ static void* tsip_header_Subscription_State_create(void *self, va_list * app) { tsip_header_Subscription_State_t *Subscription_State = self; @@ -675,8 +673,6 @@ static void* tsip_header_Subscription_State_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Subscription_State_group -*/ static void* tsip_header_Subscription_State_destroy(void *self) { tsip_header_Subscription_State_t *Subscription_State = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Supported.c b/trunk/tinySIP/src/headers/tsip_header_Supported.c index 406d4670..de2b59da 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Supported.c +++ b/trunk/tinySIP/src/headers/tsip_header_Supported.c @@ -307,8 +307,6 @@ _again: // Supported header object definition // -/**@ingroup tsip_header_Supported_group -*/ static void* tsip_header_Supported_create(void *self, va_list * app) { tsip_header_Supported_t *Supported = self; @@ -333,8 +331,6 @@ static void* tsip_header_Supported_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Supported_group -*/ static void* tsip_header_Supported_destroy(void *self) { tsip_header_Supported_t *Supported = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_To.c b/trunk/tinySIP/src/headers/tsip_header_To.c index 73f73973..f47a258f 100644 --- a/trunk/tinySIP/src/headers/tsip_header_To.c +++ b/trunk/tinySIP/src/headers/tsip_header_To.c @@ -1207,8 +1207,6 @@ _again: // To header object definition // -/**@ingroup tsip_header_To_group -*/ static void* tsip_header_To_create(void *self, va_list * app) { tsip_header_To_t *To = self; @@ -1232,8 +1230,6 @@ static void* tsip_header_To_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_To_group -*/ static void* tsip_header_To_destroy(void *self) { tsip_header_To_t *To = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_User_Agent.c b/trunk/tinySIP/src/headers/tsip_header_User_Agent.c index 609d5791..d7fbb623 100644 --- a/trunk/tinySIP/src/headers/tsip_header_User_Agent.c +++ b/trunk/tinySIP/src/headers/tsip_header_User_Agent.c @@ -272,8 +272,6 @@ _again: // User_Agent header object definition // -/**@ingroup tsip_header_User_Agent_group -*/ static void* tsip_header_User_Agent_create(void *self, va_list * app) { tsip_header_User_Agent_t *User_Agent = self; @@ -290,8 +288,6 @@ static void* tsip_header_User_Agent_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_User_Agent_group -*/ static void* tsip_header_User_Agent_destroy(void *self) { tsip_header_User_Agent_t *User_Agent = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Via.c b/trunk/tinySIP/src/headers/tsip_header_Via.c index 77221c1b..4693689c 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Via.c +++ b/trunk/tinySIP/src/headers/tsip_header_Via.c @@ -1290,8 +1290,6 @@ _again: // Via header object definition // -/**@ingroup tsip_header_Via_group -*/ static void* tsip_header_Via_create(void *self, va_list * app) { tsip_header_Via_t *via = self; @@ -1326,8 +1324,6 @@ static void* tsip_header_Via_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Via_group -*/ static void* tsip_header_Via_destroy(void *self) { tsip_header_Via_t *via = self; diff --git a/trunk/tinySIP/src/headers/tsip_header_Warning.c b/trunk/tinySIP/src/headers/tsip_header_Warning.c index 95ca6061..1085b1cd 100644 --- a/trunk/tinySIP/src/headers/tsip_header_Warning.c +++ b/trunk/tinySIP/src/headers/tsip_header_Warning.c @@ -518,8 +518,6 @@ _again: // Warning header object definition // -/**@ingroup tsip_header_Warning_group -*/ static void* tsip_header_Warning_create(void *self, va_list * app) { tsip_header_Warning_t *Warning = self; @@ -537,8 +535,6 @@ static void* tsip_header_Warning_create(void *self, va_list * app) return self; } -/**@ingroup tsip_header_Warning_group -*/ static void* tsip_header_Warning_destroy(void *self) { tsip_header_Warning_t *Warning = self; diff --git a/trunk/tinySIP/src/parsers/tsip_parser_header.c b/trunk/tinySIP/src/parsers/tsip_parser_header.c index 5f985e24..fee9cd35 100644 --- a/trunk/tinySIP/src/parsers/tsip_parser_header.c +++ b/trunk/tinySIP/src/parsers/tsip_parser_header.c @@ -60,6 +60,8 @@ #include "tinysip/headers/tsip_header_Security_Verify.h" #include "tinysip/headers/tsip_header_Server.h" #include "tinysip/headers/tsip_header_Service_Route.h" +#include "tinysip/headers/tsip_header_SIP_ETag.h" +#include "tinysip/headers/tsip_header_SIP_If_Match.h" #include "tinysip/headers/tsip_header_Subscription_State.h" #include "tinysip/headers/tsip_header_Supported.h" #include "tinysip/headers/tsip_header_To.h" @@ -96,7 +98,7 @@ * Ragel state machine. */ -/* #line 745 "tsip_parser_header.rl" */ +/* #line 749 "tsip_parser_header.rl" */ TSIP_BOOLEAN tsip_header_parse(tsk_ragel_state_t *state, tsip_message_t *message) @@ -107,7 +109,7 @@ TSIP_BOOLEAN tsip_header_parse(tsk_ragel_state_t *state, tsip_message_t *message const char *eof = pe; -/* #line 111 "../src/parsers/tsip_parser_header.c" */ +/* #line 113 "../src/parsers/tsip_parser_header.c" */ static const char _tsip_machine_parser_headers_actions[] = { 0, 1, 0, 1, 1, 1, 2, 1, 3, 1, 4, 1, 5, 1, 6, 1, @@ -2158,16 +2160,16 @@ static const int tsip_machine_parser_headers_error = 0; static const int tsip_machine_parser_headers_en_main = 1; -/* #line 755 "tsip_parser_header.rl" */ +/* #line 759 "tsip_parser_header.rl" */ -/* #line 2164 "../src/parsers/tsip_parser_header.c" */ +/* #line 2166 "../src/parsers/tsip_parser_header.c" */ { cs = tsip_machine_parser_headers_start; } -/* #line 756 "tsip_parser_header.rl" */ +/* #line 760 "tsip_parser_header.rl" */ -/* #line 2171 "../src/parsers/tsip_parser_header.c" */ +/* #line 2173 "../src/parsers/tsip_parser_header.c" */ { int _klen; unsigned int _trans; @@ -2241,70 +2243,70 @@ _match: switch ( *_acts++ ) { case 0: -/* #line 102 "tsip_parser_header.rl" */ +/* #line 104 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Accept NOT IMPLEMENTED"); } break; case 1: -/* #line 108 "tsip_parser_header.rl" */ +/* #line 110 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Accept_Contact NOT IMPLEMENTED"); } break; case 2: -/* #line 114 "tsip_parser_header.rl" */ +/* #line 116 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Accept_Encoding NOT IMPLEMENTED"); } break; case 3: -/* #line 120 "tsip_parser_header.rl" */ +/* #line 122 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Accept_Language NOT IMPLEMENTED"); } break; case 4: -/* #line 126 "tsip_parser_header.rl" */ +/* #line 128 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Accept_Resource_Priority NOT IMPLEMENTED"); } break; case 5: -/* #line 132 "tsip_parser_header.rl" */ +/* #line 134 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Alert_Info NOT IMPLEMENTED"); } break; case 6: -/* #line 138 "tsip_parser_header.rl" */ +/* #line 140 "tsip_parser_header.rl" */ { tsip_header_Allow_t *header = tsip_header_Allow_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 7: -/* #line 145 "tsip_parser_header.rl" */ +/* #line 147 "tsip_parser_header.rl" */ { tsip_header_Allow_Events_t *header = tsip_header_Allow_Events_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 8: -/* #line 152 "tsip_parser_header.rl" */ +/* #line 154 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Authentication_Info NOT IMPLEMENTED"); } break; case 9: -/* #line 158 "tsip_parser_header.rl" */ +/* #line 160 "tsip_parser_header.rl" */ { tsip_header_Authorization_t *header = tsip_header_Authorization_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 10: -/* #line 165 "tsip_parser_header.rl" */ +/* #line 167 "tsip_parser_header.rl" */ { if(!message->Call_ID) { @@ -2313,13 +2315,13 @@ _match: } break; case 11: -/* #line 174 "tsip_parser_header.rl" */ +/* #line 176 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Call_Info NOT IMPLEMENTED"); } break; case 12: -/* #line 180 "tsip_parser_header.rl" */ +/* #line 182 "tsip_parser_header.rl" */ { tsip_header_Contacts_L_t* headers = tsip_header_Contact_parse(state->tag_start, (state->tag_end-state->tag_start)); if(headers) @@ -2341,25 +2343,25 @@ _match: } break; case 13: -/* #line 202 "tsip_parser_header.rl" */ +/* #line 204 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Content_Disposition NOT IMPLEMENTED"); } break; case 14: -/* #line 208 "tsip_parser_header.rl" */ +/* #line 210 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("PARSE_HEADER_ACCEPT NOT IMPLEMENTED"); } break; case 15: -/* #line 214 "tsip_parser_header.rl" */ +/* #line 216 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Content_Language NOT IMPLEMENTED"); } break; case 16: -/* #line 220 "tsip_parser_header.rl" */ +/* #line 222 "tsip_parser_header.rl" */ { if(!message->Content_Length) { @@ -2368,7 +2370,7 @@ _match: } break; case 17: -/* #line 229 "tsip_parser_header.rl" */ +/* #line 231 "tsip_parser_header.rl" */ { if(!message->Content_Type) { @@ -2377,7 +2379,7 @@ _match: } break; case 18: -/* #line 238 "tsip_parser_header.rl" */ +/* #line 240 "tsip_parser_header.rl" */ { if(!message->CSeq) { @@ -2386,26 +2388,26 @@ _match: } break; case 19: -/* #line 247 "tsip_parser_header.rl" */ +/* #line 249 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Date NOT IMPLEMENTED"); } break; case 20: -/* #line 253 "tsip_parser_header.rl" */ +/* #line 255 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Error_Info NOT IMPLEMENTED"); } break; case 21: -/* #line 259 "tsip_parser_header.rl" */ +/* #line 261 "tsip_parser_header.rl" */ { tsip_header_Event_t *header = tsip_header_Event_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 22: -/* #line 266 "tsip_parser_header.rl" */ +/* #line 268 "tsip_parser_header.rl" */ { if(!message->Expires) { @@ -2414,7 +2416,7 @@ _match: } break; case 23: -/* #line 275 "tsip_parser_header.rl" */ +/* #line 277 "tsip_parser_header.rl" */ { if(!message->From) { @@ -2423,284 +2425,284 @@ _match: } break; case 24: -/* #line 284 "tsip_parser_header.rl" */ +/* #line 286 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_History_Info NOT IMPLEMENTED"); } break; case 25: -/* #line 290 "tsip_parser_header.rl" */ +/* #line 292 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Identity NOT IMPLEMENTED"); } break; case 26: -/* #line 296 "tsip_parser_header.rl" */ +/* #line 298 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Identity_Info NOT IMPLEMENTED"); } break; case 27: -/* #line 302 "tsip_parser_header.rl" */ +/* #line 304 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_In_Reply_To NOT IMPLEMENTED"); } break; case 28: -/* #line 308 "tsip_parser_header.rl" */ +/* #line 310 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Join NOT IMPLEMENTED"); } break; case 29: -/* #line 314 "tsip_parser_header.rl" */ +/* #line 316 "tsip_parser_header.rl" */ { tsip_header_Max_Forwards_t *header = tsip_header_Max_Forwards_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 30: -/* #line 321 "tsip_parser_header.rl" */ +/* #line 323 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_MIME_Version NOT IMPLEMENTED"); } break; case 31: -/* #line 327 "tsip_parser_header.rl" */ +/* #line 329 "tsip_parser_header.rl" */ { tsip_header_Min_Expires_t *header = tsip_header_Min_Expires_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 32: -/* #line 334 "tsip_parser_header.rl" */ +/* #line 336 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Min_SE NOT IMPLEMENTED"); } break; case 33: -/* #line 340 "tsip_parser_header.rl" */ +/* #line 342 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Organization NOT IMPLEMENTED"); } break; case 34: -/* #line 346 "tsip_parser_header.rl" */ +/* #line 348 "tsip_parser_header.rl" */ { tsip_header_P_Access_Network_Info_t *header = tsip_header_P_Access_Network_Info_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 35: -/* #line 353 "tsip_parser_header.rl" */ +/* #line 355 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_Answer_State NOT IMPLEMENTED"); } break; case 36: -/* #line 359 "tsip_parser_header.rl" */ +/* #line 361 "tsip_parser_header.rl" */ { tsip_header_P_Asserted_Identities_L_t* headers = tsip_header_P_Asserted_Identity_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 37: -/* #line 366 "tsip_parser_header.rl" */ +/* #line 368 "tsip_parser_header.rl" */ { tsip_header_P_Associated_URIs_L_t* headers = tsip_header_P_Associated_URI_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 38: -/* #line 373 "tsip_parser_header.rl" */ +/* #line 375 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_Called_Party_ID NOT IMPLEMENTED"); } break; case 39: -/* #line 379 "tsip_parser_header.rl" */ +/* #line 381 "tsip_parser_header.rl" */ { tsip_header_P_Charging_Function_Addressess_L_t* headers = tsip_header_P_Charging_Function_Addresses_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 40: -/* #line 386 "tsip_parser_header.rl" */ +/* #line 388 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_Charging_Vector NOT IMPLEMENTED"); } break; case 41: -/* #line 392 "tsip_parser_header.rl" */ +/* #line 394 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_DCS_Billing_Info NOT IMPLEMENTED"); } break; case 42: -/* #line 398 "tsip_parser_header.rl" */ +/* #line 400 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_DCS_LAES NOT IMPLEMENTED"); } break; case 43: -/* #line 404 "tsip_parser_header.rl" */ +/* #line 406 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_DCS_OSPS NOT IMPLEMENTED"); } break; case 44: -/* #line 410 "tsip_parser_header.rl" */ +/* #line 412 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_DCS_Redirect NOT IMPLEMENTED"); } break; case 45: -/* #line 416 "tsip_parser_header.rl" */ +/* #line 418 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_DCS_Trace_Party_ID NOT IMPLEMENTED"); } break; case 46: -/* #line 422 "tsip_parser_header.rl" */ +/* #line 424 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_Early_Media NOT IMPLEMENTED"); } break; case 47: -/* #line 428 "tsip_parser_header.rl" */ +/* #line 430 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_Media_Authorization NOT IMPLEMENTED"); } break; case 48: -/* #line 434 "tsip_parser_header.rl" */ +/* #line 436 "tsip_parser_header.rl" */ { tsip_header_P_Preferred_Identity_t *header = tsip_header_P_Preferred_Identity_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 49: -/* #line 441 "tsip_parser_header.rl" */ +/* #line 443 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_Profile_Key NOT IMPLEMENTED"); } break; case 50: -/* #line 447 "tsip_parser_header.rl" */ +/* #line 449 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_User_Database NOT IMPLEMENTED"); } break; case 51: -/* #line 453 "tsip_parser_header.rl" */ +/* #line 455 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_P_Visited_Network_ID NOT IMPLEMENTED"); } break; case 52: -/* #line 459 "tsip_parser_header.rl" */ +/* #line 461 "tsip_parser_header.rl" */ { tsip_header_Paths_L_t* headers = tsip_header_Path_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 53: -/* #line 466 "tsip_parser_header.rl" */ +/* #line 468 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Priority NOT IMPLEMENTED"); } break; case 54: -/* #line 472 "tsip_parser_header.rl" */ +/* #line 474 "tsip_parser_header.rl" */ { tsip_header_Privacy_t *header = tsip_header_Privacy_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 55: -/* #line 479 "tsip_parser_header.rl" */ +/* #line 481 "tsip_parser_header.rl" */ { tsip_header_Proxy_Authenticate_t *header = tsip_header_Proxy_Authenticate_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 56: -/* #line 486 "tsip_parser_header.rl" */ +/* #line 488 "tsip_parser_header.rl" */ { tsip_header_Proxy_Authorization_t *header = tsip_header_Proxy_Authorization_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 57: -/* #line 493 "tsip_parser_header.rl" */ +/* #line 495 "tsip_parser_header.rl" */ { tsip_header_Proxy_Require_t *header = tsip_header_Proxy_Require_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 58: -/* #line 500 "tsip_parser_header.rl" */ +/* #line 502 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_RAck NOT IMPLEMENTED"); } break; case 59: -/* #line 506 "tsip_parser_header.rl" */ +/* #line 508 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Reason NOT IMPLEMENTED"); } break; case 60: -/* #line 512 "tsip_parser_header.rl" */ +/* #line 514 "tsip_parser_header.rl" */ { tsip_header_Record_Route_t *header = tsip_header_Record_Route_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 61: -/* #line 519 "tsip_parser_header.rl" */ +/* #line 521 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Refer_Sub NOT IMPLEMENTED"); } break; case 62: -/* #line 525 "tsip_parser_header.rl" */ +/* #line 527 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Refer_To NOT IMPLEMENTED"); } break; case 63: -/* #line 531 "tsip_parser_header.rl" */ +/* #line 533 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Referred_By NOT IMPLEMENTED"); } break; case 64: -/* #line 537 "tsip_parser_header.rl" */ +/* #line 539 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Reject_Contact NOT IMPLEMENTED"); } break; case 65: -/* #line 543 "tsip_parser_header.rl" */ +/* #line 545 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Replaces NOT IMPLEMENTED"); } break; case 66: -/* #line 549 "tsip_parser_header.rl" */ +/* #line 551 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Reply_To NOT IMPLEMENTED"); } break; case 67: -/* #line 555 "tsip_parser_header.rl" */ +/* #line 557 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Request_Disposition NOT IMPLEMENTED"); } break; case 68: -/* #line 561 "tsip_parser_header.rl" */ +/* #line 563 "tsip_parser_header.rl" */ { tsip_header_Require_t *header = tsip_header_Require_parse(state->tag_start, (state->tag_end-state->tag_start)); if(header) @@ -2710,117 +2712,119 @@ _match: } break; case 69: -/* #line 571 "tsip_parser_header.rl" */ +/* #line 573 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Resource_Priority NOT IMPLEMENTED"); } break; case 70: -/* #line 577 "tsip_parser_header.rl" */ +/* #line 579 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Retry_After NOT IMPLEMENTED"); } break; case 71: -/* #line 583 "tsip_parser_header.rl" */ +/* #line 585 "tsip_parser_header.rl" */ { tsip_header_Routes_L_t* headers = tsip_header_Route_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 72: -/* #line 590 "tsip_parser_header.rl" */ +/* #line 592 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_RSeq NOT IMPLEMENTED"); } break; case 73: -/* #line 596 "tsip_parser_header.rl" */ +/* #line 598 "tsip_parser_header.rl" */ { tsip_header_Security_Clients_L_t* headers = tsip_header_Security_Client_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 74: -/* #line 603 "tsip_parser_header.rl" */ +/* #line 605 "tsip_parser_header.rl" */ { tsip_header_Security_Servers_L_t* headers = tsip_header_Security_Server_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 75: -/* #line 610 "tsip_parser_header.rl" */ +/* #line 612 "tsip_parser_header.rl" */ { tsip_header_Security_Verifies_L_t* headers = tsip_header_Security_Verify_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 76: -/* #line 617 "tsip_parser_header.rl" */ +/* #line 619 "tsip_parser_header.rl" */ { tsip_header_Server_t *header = tsip_header_Server_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 77: -/* #line 624 "tsip_parser_header.rl" */ +/* #line 626 "tsip_parser_header.rl" */ { tsip_header_Service_Routes_L_t* headers = tsip_header_Service_Route_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 78: -/* #line 631 "tsip_parser_header.rl" */ +/* #line 633 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Session_Expires NOT IMPLEMENTED"); } break; case 79: -/* #line 637 "tsip_parser_header.rl" */ +/* #line 639 "tsip_parser_header.rl" */ { - TSK_DEBUG_ERROR("parse_header_SIP_ETag NOT IMPLEMENTED"); + tsip_header_SIP_ETag_t *header = tsip_header_SIP_ETag_parse(state->tag_start, (state->tag_end-state->tag_start)); + ADD_HEADER(header); } break; case 80: -/* #line 643 "tsip_parser_header.rl" */ +/* #line 646 "tsip_parser_header.rl" */ { - TSK_DEBUG_ERROR("parse_header_SIP_If_Match NOT IMPLEMENTED"); + tsip_header_SIP_If_Match_t *header = tsip_header_SIP_If_Match_parse(state->tag_start, (state->tag_end-state->tag_start)); + ADD_HEADER(header); } break; case 81: -/* #line 649 "tsip_parser_header.rl" */ +/* #line 653 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Subject NOT IMPLEMENTED"); } break; case 82: -/* #line 655 "tsip_parser_header.rl" */ +/* #line 659 "tsip_parser_header.rl" */ { tsip_header_Subscription_State_t* header = tsip_header_Subscription_State_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 83: -/* #line 662 "tsip_parser_header.rl" */ +/* #line 666 "tsip_parser_header.rl" */ { tsip_header_Supported_t *header = tsip_header_Supported_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 84: -/* #line 669 "tsip_parser_header.rl" */ +/* #line 673 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Target_Dialog NOT IMPLEMENTED"); } break; case 85: -/* #line 675 "tsip_parser_header.rl" */ +/* #line 679 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Timestamp NOT IMPLEMENTED"); } break; case 86: -/* #line 681 "tsip_parser_header.rl" */ +/* #line 685 "tsip_parser_header.rl" */ { if(!message->To) { @@ -2829,20 +2833,20 @@ _match: } break; case 87: -/* #line 690 "tsip_parser_header.rl" */ +/* #line 694 "tsip_parser_header.rl" */ { TSK_DEBUG_ERROR("parse_header_Unsupported NOT IMPLEMENTED"); } break; case 88: -/* #line 696 "tsip_parser_header.rl" */ +/* #line 700 "tsip_parser_header.rl" */ { tsip_header_User_Agent_t *header = tsip_header_User_Agent_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; case 89: -/* #line 703 "tsip_parser_header.rl" */ +/* #line 707 "tsip_parser_header.rl" */ { if(!message->firstVia) { @@ -2859,20 +2863,20 @@ _match: } break; case 90: -/* #line 720 "tsip_parser_header.rl" */ +/* #line 724 "tsip_parser_header.rl" */ { tsip_header_Warnings_L_t* headers = tsip_header_Warning_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADERS(headers); } break; case 91: -/* #line 727 "tsip_parser_header.rl" */ +/* #line 731 "tsip_parser_header.rl" */ { tsip_header_WWW_Authenticate_t *header = tsip_header_WWW_Authenticate_parse(state->tag_start, (state->tag_end-state->tag_start)); ADD_HEADER(header); } break; -/* #line 2876 "../src/parsers/tsip_parser_header.c" */ +/* #line 2880 "../src/parsers/tsip_parser_header.c" */ } } @@ -2885,12 +2889,12 @@ _again: _out: {} } -/* #line 757 "tsip_parser_header.rl" */ +/* #line 761 "tsip_parser_header.rl" */ return ( cs >= -/* #line 2892 "../src/parsers/tsip_parser_header.c" */ +/* #line 2896 "../src/parsers/tsip_parser_header.c" */ 1299 -/* #line 758 "tsip_parser_header.rl" */ +/* #line 762 "tsip_parser_header.rl" */ ); //return (cs == tsip_machine_parser_headers_first_final); } diff --git a/trunk/tinySIP/src/tsip_operation.c b/trunk/tinySIP/src/tsip_operation.c index 8ad55757..dea31844 100644 --- a/trunk/tinySIP/src/tsip_operation.c +++ b/trunk/tinySIP/src/tsip_operation.c @@ -92,13 +92,12 @@ int __tsip_operation_set(tsip_operation_t *self, va_list values) const char* name = va_arg(values, const char *); const char* value = va_arg(values, const char *); - tsk_param_t *param = TSK_PARAM_CREATE(name, value); if(curr == optype_param){ - tsk_list_push_back_data(self->params, ((void**) ¶m)); + tsk_params_add_param(&self->params, name, value); // Add or Update a param } else if(curr == optype_header){ - tsk_list_push_back_data(self->headers, ((void**) ¶m)); + tsk_params_add_param(&self->headers, name, value); }else if(curr == optype_caps){ - tsk_list_push_back_data(self->caps, ((void**) ¶m)); + tsk_params_add_param(&self->caps, name, value); } break; } @@ -154,6 +153,15 @@ const tsk_param_t* tsip_operation_get_param(const tsip_operation_handle_t *self, return TSIP_NULL; } +const tsk_param_t* tsip_operation_get_header(const tsip_operation_handle_t *self, const char* hname) +{ + if(self){ + const tsip_operation_t *operation = self; + return tsk_params_get_param_by_name(operation->headers, hname); + } + return TSIP_NULL; +} + const tsk_params_L_t* tsip_operation_get_headers(const tsip_operation_handle_t *self) { if(self){ diff --git a/trunk/tinySIP/test/test/test_stack.h b/trunk/tinySIP/test/test/test_stack.h index 153743cd..594afbdb 100644 --- a/trunk/tinySIP/test/test/test_stack.h +++ b/trunk/tinySIP/test/test/test_stack.h @@ -32,6 +32,41 @@ # endif #endif +#define TEST_STACK_PIDF \ + ""\ + ""\ + " "\ + " "\ + " open"\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " Hello world"\ + " "\ + " "\ + " "\ + " open"\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " "\ + " urn:uuid:dd1289fa-c3d7-47bd-a40d-f1f1b2cc5ffc"\ + " "\ + "" + int test_stack_callback(const tsip_event_t *sipevent) { TSK_DEBUG_INFO("\n====\nSTACK event: %d [%s] with opid=%lld\n=====", @@ -188,7 +223,7 @@ int test_stack_callback(const tsip_event_t *sipevent) void test_stack() { - /* +/* tsip_stack_handle_t *stack = tsip_stack_create(test_stack_callback, TSIP_STACK_SET_DISPLAY_NAME("2233392625"), TSIP_STACK_SET_PUBLIC_IDENTITY("sip:2233392625@sip2sip.info"), @@ -201,11 +236,11 @@ void test_stack() //TSIP_STACK_SET_PROXY_CSCF("192.168.0.15", "udp", 0), TSIP_STACK_SET_PROXY_CSCF_PORT(5060), TSIP_STACK_SET_MOBILITY("fixed"), - TSIP_STACK_SET_DEVICE_ID("DD1289FA-C3D7-47bd-A40D-F1F1B2CC5FFC"), + TSIP_STACK_SET_DEVICE_ID("dd1289fa-c3d7-47bd-a40d-f1f1b2cc5ffc"), TSIP_STACK_SET_NETINFO("ADSL;utran-cell-id-3gpp=00000000"), TSIP_STACK_SET_PRIVACY("header;id"), - */ -/* +*/ + tsip_stack_handle_t *stack = tsip_stack_create(test_stack_callback, TSIP_STACK_SET_DISPLAY_NAME("Mamadou"), TSIP_STACK_SET_PUBLIC_IDENTITY("sip:mamadou@ericsson.com"), @@ -217,13 +252,13 @@ void test_stack() TSIP_STACK_SET_PROXY_CSCF("192.168.0.11", "udp", 0), //TSIP_STACK_SET_PROXY_CSCF("192.168.0.15", "udp", 0), TSIP_STACK_SET_PROXY_CSCF_PORT(5081), - TSIP_STACK_SET_SECAGREE_IPSEC("hmac-md5-96", "null", "trans", "esp"), + //TSIP_STACK_SET_SECAGREE_IPSEC("hmac-md5-96", "null", "trans", "esp"), TSIP_STACK_SET_MOBILITY("fixed"), - TSIP_STACK_SET_DEVICE_ID("DD1289FA-C3D7-47bd-A40D-F1F1B2CC5FFC"), + TSIP_STACK_SET_DEVICE_ID("dd1289fa-c3d7-47bd-a40d-f1f1b2cc5ffc"), TSIP_STACK_SET_NETINFO("ADSL;utran-cell-id-3gpp=00000000"), TSIP_STACK_SET_PRIVACY("header;id"), -*/ - + +/* tsip_stack_handle_t *stack = tsip_stack_create(test_stack_callback, TSIP_STACK_SET_DISPLAY_NAME("Mamadou"), TSIP_STACK_SET_PUBLIC_IDENTITY("sip:mamadou@ims.inexbee.com"), @@ -237,9 +272,10 @@ void test_stack() TSIP_STACK_SET_PROXY_CSCF_PORT(4060), //TSIP_STACK_SET_SECAGREE_IPSEC("hmac-md5-96", "null", "trans", "esp"), TSIP_STACK_SET_MOBILITY("fixed"), - TSIP_STACK_SET_DEVICE_ID("DD1289FA-C3D7-47bd-A40D-F1F1B2CC5FFC"), + TSIP_STACK_SET_DEVICE_ID("dd1289fa-c3d7-47bd-a40d-f1f1b2cc5ffc"), TSIP_STACK_SET_NETINFO("ADSL;utran-cell-id-3gpp=00000000"), TSIP_STACK_SET_PRIVACY("header;id"), +*/ TSIP_STACK_SET_NULL()); @@ -261,29 +297,43 @@ void test_stack() tsk_thread_sleep(2000); + ///* SUBSCRIBE */ + //{ + // tsip_operation_handle_t *op2 = TSIP_OPERATION_CREATE(stack, + // TSIP_OPERATION_SET_PARAM("to", "sip:mamadou@ims.inexbee.com"), + // TSIP_OPERATION_SET_PARAM("expires", "30"), + // TSIP_OPERATION_SET_HEADER("Event", "reg"), + // TSIP_OPERATION_SET_HEADER("Accept", "application/reginfo+xml"), + // TSIP_OPERATION_SET_HEADER("Allow-Events", "refer, presence, presence.winfo, xcap-diff"), + // TSIP_OPERATION_SET_HEADER("Allow", "INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER"), + // + // TSIP_OPERATION_SET_NULL()); + // tsip_subscribe(stack, op2); + //} + + ///* MESSAGE */ + //{ + // tsip_operation_handle_t *op3 = TSIP_OPERATION_CREATE(stack, + // TSIP_OPERATION_SET_PARAM("to", "sip:laurent@ims.inexbee.com"), + // TSIP_OPERATION_SET_HEADER("Accept-Contact", "*;+g.oma.sip-im"), + // TSIP_OPERATION_SET_HEADER("Content-Type", "text/plain"), + + // TSIP_OPERATION_SET_PARAM("content", "test"), + // + // TSIP_OPERATION_SET_NULL()); + // tsip_message(stack, op3); + //} + + /* PUBLISH */ { - tsip_operation_handle_t *op2 = TSIP_OPERATION_CREATE(stack, - TSIP_OPERATION_SET_PARAM("to", "sip:mamadou@ims.inexbee.com"), - TSIP_OPERATION_SET_PARAM("expires", "30"), - TSIP_OPERATION_SET_HEADER("Event", "reg"), - TSIP_OPERATION_SET_HEADER("Accept", "application/reginfo+xml"), - TSIP_OPERATION_SET_HEADER("Allow-Events", "refer, presence, presence.winfo, xcap-diff"), - TSIP_OPERATION_SET_HEADER("Allow", "INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER"), + tsip_operation_handle_t *op4 = TSIP_OPERATION_CREATE(stack, + TSIP_OPERATION_SET_PARAM("to", "sip:mamadou@ericsson.com"), + TSIP_OPERATION_SET_HEADER("Content-Type", "application/pidf+xml"), + + TSIP_OPERATION_SET_PARAM("content", TEST_STACK_PIDF), TSIP_OPERATION_SET_NULL()); - tsip_subscribe(stack, op2); - } - - { - tsip_operation_handle_t *op3 = TSIP_OPERATION_CREATE(stack, - TSIP_OPERATION_SET_PARAM("to", "sip:laurent@ims.inexbee.com"), - TSIP_OPERATION_SET_HEADER("Accept-Contact", "*;+g.oma.sip-im"), - TSIP_OPERATION_SET_HEADER("Content-Type", "text/plain"), - - TSIP_OPERATION_SET_PARAM("content", "test"), - - TSIP_OPERATION_SET_NULL()); - tsip_message(stack, op3); + tsip_publish(stack, op4); } //while(1);//tsk_thread_sleep(500);