summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-07-28 04:16:18 +0200
committerPatrick McHardy <kaber@trash.net>2010-07-28 04:16:18 +0200
commit3b1bb63c59e95e8762e20f61b2c5d0d229d302df (patch)
tree73e2328b452c68d1d1961a4e5a9fa6ea21aa08bc
parent81f4af6430b0d6c63039199b2b788f0945bcea6e (diff)
smsg: use <<IE-NAME>> notation as in EN 300 175-5
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--src/s_msg.c130
1 files changed, 65 insertions, 65 deletions
diff --git a/src/s_msg.c b/src/s_msg.c
index a8b139d..85d9919 100644
--- a/src/s_msg.c
+++ b/src/s_msg.c
@@ -1717,120 +1717,120 @@ static const struct dect_ie_handler {
void (*dump)(const struct dect_ie_common *ie);
} dect_ie_handlers[256] = {
[S_SO_IE_REPEAT_INDICATOR] = {
- .name = "repeat indicator",
+ .name = "REPEAT-INDICATOR",
.parse = dect_sfmt_parse_repeat_indicator,
.build = dect_sfmt_build_repeat_indicator,
.dump = dect_sfmt_dump_repeat_indicator,
},
[S_SE_IE_SENDING_COMPLETE] = {
- .name = "sending complete",
+ .name = "SENDING-COMPLETE",
.size = sizeof(struct dect_ie_sending_complete),
.parse = dect_sfmt_parse_empty_single_octet,
.build = dect_sfmt_build_empty_single_octet,
},
[S_SE_IE_DELIMITER_REQUEST] = {
- .name = "delimiter request",
+ .name = "DELIMITER-REQUEST",
.size = sizeof(struct dect_ie_delimiter_request),
.parse = dect_sfmt_parse_empty_single_octet,
.build = dect_sfmt_build_empty_single_octet,
},
[S_SE_IE_USE_TPUI] = {
- .name = "use TPUI",
+ .name = "USE-TPUI",
.size = sizeof(struct dect_ie_use_tpui),
.parse = dect_sfmt_parse_empty_single_octet,
.build = dect_sfmt_build_empty_single_octet,
},
[S_DO_IE_BASIC_SERVICE] = {
- .name = "basic service",
+ .name = "BASIC-SERVICE",
.size = sizeof(struct dect_ie_basic_service),
.parse = dect_sfmt_parse_basic_service,
.build = dect_sfmt_build_basic_service,
.dump = dect_sfmt_dump_basic_service,
},
[S_DO_IE_RELEASE_REASON] = {
- .name = "release reason",
+ .name = "RELEASE-REASON",
.size = sizeof(struct dect_ie_release_reason),
.parse = dect_sfmt_parse_release_reason,
.build = dect_sfmt_build_release_reason,
.dump = dect_sfmt_dump_release_reason,
},
[S_DO_IE_SIGNAL] = {
- .name = "signal",
+ .name = "SIGNAL",
.size = sizeof(struct dect_ie_signal),
.parse = dect_sfmt_parse_signal,
.build = dect_sfmt_build_signal,
.dump = dect_sfmt_dump_signal,
},
[S_DO_IE_TIMER_RESTART] = {
- .name = "timer restart",
+ .name = "TIMER-RESTART",
.size = sizeof(struct dect_ie_timer_restart),
.parse = dect_sfmt_parse_timer_restart,
},
[S_DO_IE_TEST_HOOK_CONTROL] = {
- .name = "test hook control",
+ .name = "TEST-HOOK-CONTROL",
},
[S_DO_IE_SINGLE_DISPLAY] = {
- .name = "single display",
+ .name = "SINGLE-DISPLAY",
.size = sizeof(struct dect_ie_display),
.parse = dect_sfmt_parse_single_display,
.build = dect_sfmt_build_single_display,
.dump = dect_sfmt_dump_display,
},
[S_DO_IE_SINGLE_KEYPAD] = {
- .name = "single keypad",
+ .name = "SINGLE-KEYPAD",
.size = sizeof(struct dect_ie_keypad),
.parse = dect_sfmt_parse_single_keypad,
.build = dect_sfmt_build_single_keypad,
.dump = dect_sfmt_dump_keypad,
},
[S_VL_IE_INFO_TYPE] = {
- .name = "info type",
+ .name = "INFO-TYPE",
.size = sizeof(struct dect_ie_info_type),
.parse = dect_sfmt_parse_info_type,
.build = dect_sfmt_build_info_type,
.dump = dect_sfmt_dump_info_type,
},
[S_VL_IE_IDENTITY_TYPE] = {
- .name = "identity type",
+ .name = "IDENTITY-TYPE",
.size = sizeof(struct dect_ie_identity_type),
.parse = dect_sfmt_parse_identity_type,
.build = dect_sfmt_build_identity_type,
.dump = dect_sfmt_dump_identity_type,
},
[S_VL_IE_PORTABLE_IDENTITY] = {
- .name = "portable identity",
+ .name = "PORTABLE-IDENTITY",
.size = sizeof(struct dect_ie_portable_identity),
.parse = dect_sfmt_parse_portable_identity,
.build = dect_sfmt_build_portable_identity,
.dump = dect_sfmt_dump_portable_identity,
},
[S_VL_IE_FIXED_IDENTITY] = {
- .name = "fixed identity",
+ .name = "FIXED-IDENTITY",
.size = sizeof(struct dect_ie_fixed_identity),
.parse = dect_sfmt_parse_fixed_identity,
.build = dect_sfmt_build_fixed_identity,
.dump = dect_sfmt_dump_fixed_identity,
},
[S_VL_IE_LOCATION_AREA] = {
- .name = "location area",
+ .name = "LOCATION-AREA",
.size = sizeof(struct dect_ie_location_area),
.parse = dect_sfmt_parse_location_area,
.build = dect_sfmt_build_location_area,
.dump = dect_sfmt_dump_location_area,
},
[S_VL_IE_NWK_ASSIGNED_IDENTITY] = {
- .name = "NWK assigned identity",
+ .name = "NWK-ASSIGNED-IDENTITY",
.size = sizeof(struct dect_ie_nwk_assigned_identity),
},
[S_VL_IE_ALLOCATION_TYPE] = {
- .name = "allocation type",
+ .name = "ALLOCATION-TYPE",
.size = sizeof(struct dect_ie_allocation_type),
.parse = dect_sfmt_parse_allocation_type,
.build = dect_sfmt_build_allocation_type,
.dump = dect_sfmt_dump_allocation_type,
},
[S_VL_IE_AUTH_TYPE] = {
- .name = "auth type",
+ .name = "AUTH-TYPE",
.size = sizeof(struct dect_ie_auth_type),
.parse = dect_sfmt_parse_auth_type,
.build = dect_sfmt_build_auth_type,
@@ -1858,217 +1858,217 @@ static const struct dect_ie_handler {
.dump = dect_sfmt_dump_auth_value,
},
[S_VL_IE_IWU_ATTRIBUTES] = {
- .name = "IWU attributes",
+ .name = "IWU-ATTRIBUTES",
.size = sizeof(struct dect_ie_iwu_attributes),
},
[S_VL_IE_CALL_ATTRIBUTES] = {
- .name = "call attributes",
+ .name = "CALL-ATTRIBUTES",
.size = sizeof(struct dect_ie_call_attributes),
},
[S_VL_IE_SERVICE_CHANGE_INFO] = {
- .name = "service change info",
+ .name = "SERVICE-CHANGE-INFO",
.size = sizeof(struct dect_ie_service_change_info),
},
[S_VL_IE_CONNECTION_ATTRIBUTES] = {
- .name = "connection attributes",
+ .name = "CONNECTION-ATTRIBUTES",
.size = sizeof(struct dect_ie_connection_attributes),
},
[S_VL_IE_CIPHER_INFO] = {
- .name = "cipher info",
+ .name = "CIPHER-INFO",
.size = sizeof(struct dect_ie_cipher_info),
.parse = dect_sfmt_parse_cipher_info,
.build = dect_sfmt_build_cipher_info,
.dump = dect_sfmt_dump_cipher_info,
},
[S_VL_IE_CALL_IDENTITY] = {
- .name = "call identity",
+ .name = "CALL-IDENTITY",
.size = sizeof(struct dect_ie_call_identity),
},
[S_VL_IE_CONNECTION_IDENTITY] = {
- .name = "connection identity",
+ .name = "CONNECTION-IDENTITY",
.size = sizeof(struct dect_ie_connection_identity),
},
[S_VL_IE_FACILITY] = {
- .name = "facility",
+ .name = "FACILITY",
.size = sizeof(struct dect_ie_facility),
},
[S_VL_IE_PROGRESS_INDICATOR] = {
- .name = "progress indicator",
+ .name = "PROGRESS-INDICATOR",
.size = sizeof(struct dect_ie_progress_indicator),
.parse = dect_sfmt_parse_progress_indicator,
.build = dect_sfmt_build_progress_indicator,
},
[S_VL_IE_MMS_GENERIC_HEADER] = {
- .name = "MMS generic header",
+ .name = "MMS-GENERIC-HEADER",
.size = sizeof(struct dect_ie_mms_generic_header),
},
[S_VL_IE_MMS_OBJECT_HEADER] = {
- .name = "MMS object header",
+ .name = "MMS-OBJECT-HEADER",
.size = sizeof(struct dect_ie_mms_object_header),
},
[S_VL_IE_MMS_EXTENDED_HEADER] = {
- .name = "MMS extended header",
+ .name = "MMS-EXTENDED-HEADER",
.size = sizeof(struct dect_ie_mms_extended_header),
},
[S_VL_IE_TIME_DATE] = {
- .name = "time-date",
+ .name = "TIME-DATA",
.size = sizeof(struct dect_ie_time_date),
},
[S_VL_IE_MULTI_DISPLAY] = {
- .name = "multi display",
+ .name = "MULTI-DISPLAY",
.size = sizeof(struct dect_ie_display),
.parse = dect_sfmt_parse_multi_display,
.build = dect_sfmt_build_multi_display,
.dump = dect_sfmt_dump_display,
},
[S_VL_IE_MULTI_KEYPAD] = {
- .name = "multi keypad",
+ .name = "MULTI-KEYPAD",
.size = sizeof(struct dect_ie_keypad),
.parse = dect_sfmt_parse_multi_keypad,
.build = dect_sfmt_build_multi_keypad,
.dump = dect_sfmt_dump_keypad,
},
[S_VL_IE_FEATURE_ACTIVATE] = {
- .name = "feature activate",
+ .name = "FEATURE-ACTIVATE",
.size = sizeof(struct dect_ie_feature_activate),
.build = dect_sfmt_build_feature_activate,
.dump = dect_sfmt_dump_feature_activate,
},
[S_VL_IE_FEATURE_INDICATE] = {
- .name = "feature indicate",
+ .name = "FEATURE-INDICATE",
.size = sizeof(struct dect_ie_feature_indicate),
.parse = dect_sfmt_parse_feature_indicate,
.dump = dect_sfmt_dump_feature_indicate,
},
[S_VL_IE_NETWORK_PARAMETER] = {
- .name = "network parameter",
+ .name = "NETWORK-PARAMETER",
.size = sizeof(struct dect_ie_network_parameter),
},
[S_VL_IE_EXT_HO_INDICATOR] = {
- .name = "ext H/O indicator",
+ .name = "EXT-H/O-INDICATOR",
.size = sizeof(struct dect_ie_ext_ho_indicator),
},
[S_VL_IE_ZAP_FIELD] = {
- .name = "ZAP field",
+ .name = "ZAP-FIELD",
.size = sizeof(struct dect_ie_zap_field),
},
[S_VL_IE_SERVICE_CLASS] = {
- .name = "service class",
+ .name = "SERVICE-CLASS",
.size = sizeof(struct dect_ie_service_class),
},
[S_VL_IE_KEY] = {
- .name = "key",
+ .name = "KEY",
.size = sizeof(struct dect_ie_key),
},
[S_VL_IE_REJECT_REASON] = {
- .name = "reject reason",
+ .name = "REJECT-REASON",
.size = sizeof(struct dect_ie_reject_reason),
.parse = dect_sfmt_parse_reject_reason,
.build = dect_sfmt_build_reject_reason,
.dump = dect_sfmt_dump_reject_reason,
},
[S_VL_IE_SETUP_CAPABILITY] = {
- .name = "setup capability",
+ .name = "SETUP-CAPABILITY",
.size = sizeof(struct dect_ie_setup_capability),
.parse = dect_sfmt_parse_setup_capability,
.build = dect_sfmt_build_setup_capability,
},
[S_VL_IE_TERMINAL_CAPABILITY] = {
- .name = "terminal capability",
+ .name = "TERMINAL-CAPABILITY",
.size = sizeof(struct dect_ie_terminal_capability),
.parse = dect_sfmt_parse_terminal_capability,
.build = dect_sfmt_build_terminal_capability,
.dump = dect_sfmt_dump_terminal_capability,
},
[S_VL_IE_END_TO_END_COMPATIBILITY] = {
- .name = "end-to-end compatibility",
+ .name = "END-TO-END-COMPATIBILITY",
.size = sizeof(struct dect_ie_end_to_end_compatibility),
},
[S_VL_IE_RATE_PARAMETERS] = {
- .name = "rate parameters",
+ .name = "RATE-PARAMETERS",
.size = sizeof(struct dect_ie_rate_parameters),
},
[S_VL_IE_TRANSIT_DELAY] = {
- .name = "transit delay",
+ .name = "TRANSIT-DELAY",
.size = sizeof(struct dect_ie_transit_delay),
},
[S_VL_IE_WINDOW_SIZE] = {
- .name = "window size",
+ .name = "WINDOW-SIZE",
.size = sizeof(struct dect_ie_window_size),
},
[S_VL_IE_CALLING_PARTY_NUMBER] = {
- .name = "calling party number",
+ .name = "CALLING-PARTY-NUMBER",
.size = sizeof(struct dect_ie_calling_party_number),
},
[S_VL_IE_CALLING_PARTY_NAME] = {
- .name = "calling party name",
+ .name = "CALLING-PARTY-NAME",
.size = sizeof(struct dect_ie_calling_party_name),
},
[S_VL_IE_CALLED_PARTY_NUMBER] = {
- .name = "called party number",
+ .name = "CALLED-PARTY-NUMBER",
.size = sizeof(struct dect_ie_called_party_number),
.parse = dect_sfmt_parse_called_party_number,
.build = dect_sfmt_build_called_party_number,
.dump = dect_sfmt_dump_called_party_number,
},
[S_VL_IE_CALLED_PARTY_SUBADDR] = {
- .name = "called party subaddress",
+ .name = "CALLED-PARTY-SUBADDRESS",
.size = sizeof(struct dect_ie_called_party_subaddress),
},
[S_VL_IE_DURATION] = {
- .name = "duration",
+ .name = "DURATION",
.size = sizeof(struct dect_ie_duration),
.parse = dect_sfmt_parse_duration,
.build = dect_sfmt_build_duration,
.dump = dect_sfmt_dump_duration,
},
[S_VL_IE_SEGMENTED_INFO] = {
- .name = "segmented info",
+ .name = "SEGMENTED-INFO",
.size = sizeof(struct dect_ie_segmented_info),
},
[S_VL_IE_ALPHANUMERIC] = {
- .name = "alphanumeric",
+ .name = "ALPHANUMERIC",
.size = sizeof(struct dect_ie_alphanumeric),
},
[S_VL_IE_IWU_TO_IWU] = {
- .name = "IWU-to-IWU",
+ .name = "IWU-TO-IWU",
.size = sizeof(struct dect_ie_iwu_to_iwu),
.parse = dect_sfmt_parse_iwu_to_iwu,
.build = dect_sfmt_build_iwu_to_iwu,
.dump = dect_sfmt_dump_iwu_to_iwu,
},
[S_VL_IE_MODEL_IDENTIFIER] = {
- .name = "model identifier",
+ .name = "MODEL-IDENTIFIER",
.size = sizeof(struct dect_ie_model_identifier),
},
[S_VL_IE_IWU_PACKET] = {
- .name = "IWU-packet",
+ .name = "IWU-PACKET",
.size = sizeof(struct dect_ie_iwu_packet),
},
[S_VL_IE_ESCAPE_TO_PROPRIETARY] = {
- .name = "escape to proprietary",
+ .name = "ESCAPE-TO-PROPRIETARY",
.size = sizeof(struct dect_ie_escape_to_proprietary),
.parse = dect_sfmt_parse_escape_to_proprietary,
.build = dect_sfmt_build_escape_to_proprietary,
.dump = dect_sfmt_dump_escape_to_proprietary,
},
[S_VL_IE_CODEC_LIST] = {
- .name = "codec list",
+ .name = "CODEC-LIST",
.size = sizeof(struct dect_ie_codec_list),
.parse = dect_sfmt_parse_codec_list,
.build = dect_sfmt_build_codec_list,
.dump = dect_sfmt_dump_codec_list,
},
[S_VL_IE_EVENTS_NOTIFICATION] = {
- .name = "events notification",
+ .name = "EVENTS-NOTIFICATION",
.size = sizeof(struct dect_ie_events_notification),
},
[S_VL_IE_CALL_INFORMATION] = {
- .name = "call information",
+ .name = "CALL-INFORMATION",
.size = sizeof(struct dect_ie_call_information),
},
[S_VL_IE_ESCAPE_FOR_EXTENSION] = {
- .name = "escape for extension",
+ .name = "ESCAPE-FOR-EXTENSION",
},
};
@@ -2196,7 +2196,7 @@ static int dect_parse_sfmt_ie(const struct dect_handle *dh,
goto err1;
}
- sfmt_debug(" IE: <%s> id: %x len: %u dst: %p\n",
+ sfmt_debug(" IE: <<%s>> id: %x len: %u dst: %p\n",
ieh->name, ie->id, ie->len, *dst);
err = ieh->parse(dh, dst, ie);
@@ -2340,7 +2340,7 @@ dect_build_sfmt_ie(const struct dect_handle *dh,
if (ieh->build == NULL)
goto err1;
- sfmt_debug(" IE: <%s> id: %x %p\n", ieh->name, type, ie);
+ sfmt_debug(" IE: <<%s>> id: %x %p\n", ieh->name, type, ie);
if (ieh->dump != NULL)
ieh->dump(ie);