diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-02-11 10:15:46 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-02-11 18:01:42 +0000 |
| commit | 055b4c59e4f4bbe724c09ce47d5a08eb92e89fc8 (patch) | |
| tree | 79986a04b86c084ac1cee1198db25ab0a6eb542a /tpncp | |
| parent | 52559702a08c05a96bca108079d2a5c4a8111dfd (diff) | |
TPNCP: Support IPv6 without modifying tpncp.dat
This reverts tpncp.dat changes in f307dcc1d4b043f7644abc430737ceacf624aafb
in order to maintain compatibility with previous versions of the dissector.
Also update the real value of address family for IPv6, and reset
address family after using it.
Change-Id: I87acf85a84a5ad41fea4a5658181badccebefcb8
Reviewed-on: https://code.wireshark.org/review/36074
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tpncp')
| -rw-r--r-- | tpncp/tpncp.dat | 198 |
1 files changed, 146 insertions, 52 deletions
diff --git a/tpncp/tpncp.dat b/tpncp/tpncp.dat index e6abcea17e..765a7c8ae0 100644 --- a/tpncp/tpncp.dat +++ b/tpncp/tpncp.dat @@ -2383,7 +2383,8 @@ LdapConnectionStatus LDAP_CONNECTION_BROKEN 1 LdapConnectionStatus LDAP_CONNECTING 2 LdapConnectionStatus LDAP_CONNECTED 3 AddressFamily IP_VERSION4_ADDR 2 -AddressFamily IP_VERSION6_ADDR 28 +AddressFamily IP_VERSION6_ADDR 10 +AddressFamily IP_VERSION6_ADDR_PSOS 28 RestConnectionStatus1 REST_NOT_APPLICABLE 0 RestConnectionStatus1 REST_NOT_CONNECTED 1 RestConnectionStatus1 REST_SERVER_DNS_RESOLVING 2 @@ -10048,7 +10049,10 @@ FirmwareModule HA_MODULE_BOUNDARY 29 454 user_data1 0 32 0 0 primitive 454 user_data2 0 32 0 0 primitive 454 address_family 0 32 0 0 AddressFamily -454 ip_addr 1 128 0 1 primitive +454 i_pvx_addr_0 1 32 0 0 primitive +454 i_pvx_addr_1 1 32 0 0 primitive +454 i_pvx_addr_2 1 32 0 0 primitive +454 i_pvx_addr_3 1 32 0 0 primitive 454 port 0 32 0 0 primitive 454 body_len 0 32 0 0 primitive 454 body_hndle 0 32 0 0 primitive @@ -10059,9 +10063,15 @@ FirmwareModule HA_MODULE_BOUNDARY 29 636 old_remote_port 1 16 0 0 primitive 636 new_ssrc 1 32 0 0 primitive 636 address_family 0 32 0 0 AddressFamily -636 ip_addr 1 128 0 1 primitive -636 old_ip_addr_address_family 0 32 0 0 AddressFamily -636 old_ip_addr 1 128 0 1 primitive +636 i_pvx_addr_0 1 32 0 0 primitive +636 i_pvx_addr_1 1 32 0 0 primitive +636 i_pvx_addr_2 1 32 0 0 primitive +636 i_pvx_addr_3 1 32 0 0 primitive +636 old_ip_addr_address_family 0 32 0 1 AddressFamily +636 old_ip_addr_i_pvx_addr_0 1 32 0 1 primitive +636 old_ip_addr_i_pvx_addr_1 1 32 0 1 primitive +636 old_ip_addr_i_pvx_addr_2 1 32 0 1 primitive +636 old_ip_addr_i_pvx_addr_3 1 32 0 1 primitive 636 inbound_stream_protocol_type 0 32 0 0 InboundStreamProtocolType 636 is_stun_request 1 8 0 0 primitive 450 nfs_mount_success 0 32 0 0 NfsMountSuccess @@ -10447,7 +10457,10 @@ FirmwareModule HA_MODULE_BOUNDARY 29 650 is_connected 1 8 0 0 primitive 661 stun_use_candidate_request_port 1 16 0 0 primitive 661 address_family 0 32 0 0 AddressFamily -661 ip_addr 1 128 0 1 primitive +661 i_pvx_addr_0 1 32 0 0 primitive +661 i_pvx_addr_1 1 32 0 0 primitive +661 i_pvx_addr_2 1 32 0 0 primitive +661 i_pvx_addr_3 1 32 0 0 primitive 654 dsp_channel_utilization_cost 1 32 0 0 primitive 652 initial_bitrate 1 32 0 0 primitive 652 over_use_detecded_reason 0 32 0 0 OverUseDetecdedReason @@ -14087,25 +14100,46 @@ FirmwareModule HA_MODULE_BOUNDARY 29 4 video_is_disable_rtcp_interval_randomization 1 8 0 0 primitive 4 video_ip_tos_field_in_udp_packet 1 8 0 0 primitive 4 address_family 0 32 0 0 AddressFamily -4 ip_addr 1 128 0 1 primitive +4 ipv6_addr_0 1 32 0 1 primitive +4 ipv6_addr_1 1 32 0 1 primitive +4 ipv6_addr_2 1 32 0 1 primitive +4 ipv6_addr_3 1 32 0 1 primitive 4 video_remote_rtp_port 1 16 0 0 primitive 4 video_remote_rtcp_port 1 16 0 0 primitive 4 video_tx_rtp_payload_type 0 32 0 0 primitive 4 video_rx_rtp_payload_type 0 32 0 0 primitive -4 video_remote_rtcpip_add_address_family 0 32 0 0 AddressFamily -4 video_remote_rtcpip_add 1 128 0 1 primitive -4 remote_rtpip_addr_address_family 0 32 0 0 AddressFamily -4 remote_rtpip_addr 1 128 0 1 primitive -4 remote_t38ip_addr_address_family 0 32 0 0 AddressFamily -4 remote_t38ip_addr 1 128 0 1 primitive -4 remote_rtcpip_add_address_family 0 32 0 0 AddressFamily -4 remote_rtcpip_add 1 128 0 1 primitive -4 source_ip_address_family 0 32 0 0 AddressFamily -4 source_ip 0 128 0 1 primitive +4 video_remote_rtcpip_add_address_family 0 32 0 1 AddressFamily +4 video_remote_rtcpip_add_ipv6_addr_0 1 32 0 1 primitive +4 video_remote_rtcpip_add_ipv6_addr_1 1 32 0 1 primitive +4 video_remote_rtcpip_add_ipv6_addr_2 1 32 0 1 primitive +4 video_remote_rtcpip_add_ipv6_addr_3 1 32 0 1 primitive +4 remote_rtpip_addr_address_family 0 32 0 1 AddressFamily +4 remote_rtpip_addr_ipv6_addr_0 1 32 0 1 primitive +4 remote_rtpip_addr_ipv6_addr_1 1 32 0 1 primitive +4 remote_rtpip_addr_ipv6_addr_2 1 32 0 1 primitive +4 remote_rtpip_addr_ipv6_addr_3 1 32 0 1 primitive +4 remote_t38ip_addr_address_family 0 32 0 1 AddressFamily +4 remote_t38ip_addr_ipv6_addr_0 1 32 0 1 primitive +4 remote_t38ip_addr_ipv6_addr_1 1 32 0 1 primitive +4 remote_t38ip_addr_ipv6_addr_2 1 32 0 1 primitive +4 remote_t38ip_addr_ipv6_addr_3 1 32 0 1 primitive +4 remote_rtcpip_add_address_family 0 32 0 1 AddressFamily +4 remote_rtcpip_add_ipv6_addr_0 1 32 0 1 primitive +4 remote_rtcpip_add_ipv6_addr_1 1 32 0 1 primitive +4 remote_rtcpip_add_ipv6_addr_2 1 32 0 1 primitive +4 remote_rtcpip_add_ipv6_addr_3 1 32 0 1 primitive +4 source_ip_address_family 0 32 0 1 AddressFamily +4 source_ip_ipv6_addr_0 1 32 0 1 primitive +4 source_ip_ipv6_addr_1 1 32 0 1 primitive +4 source_ip_ipv6_addr_2 1 32 0 1 primitive +4 source_ip_ipv6_addr_3 1 32 0 1 primitive 4 rtp_sequence_number_mode 0 32 0 0 RTPSequenceNumberMode 4 rtpssrc_mode 0 32 0 0 RTPSSRCMode 4 remote_v1501ip_add_address_family 0 32 0 0 AddressFamily -4 remote_v1501ip_add 1 128 0 1 primitive +4 remote_v1501ip_add_ipv6_addr_0 1 32 0 1 primitive +4 remote_v1501ip_add_ipv6_addr_1 1 32 0 1 primitive +4 remote_v1501ip_add_ipv6_addr_2 1 32 0 1 primitive +4 remote_v1501ip_add_ipv6_addr_3 1 32 0 1 primitive 4 remote_v1501_port 1 16 0 0 primitive 4 v1501_dummy 1 16 0 0 primitive 4 incoming_v1501_port_option 0 32 0 0 V1501RTPPortOption @@ -14133,11 +14167,17 @@ FirmwareModule HA_MODULE_BOUNDARY 29 4 state_update_time_stamp 1 32 0 0 primitive 610 channel_id 0 32 0 0 primitive 610 address_family 0 32 0 0 AddressFamily -610 ip_addr 1 128 0 1 primitive +610 ipv6_addr_0 1 32 0 1 primitive +610 ipv6_addr_1 1 32 0 1 primitive +610 ipv6_addr_2 1 32 0 1 primitive +610 ipv6_addr_3 1 32 0 1 primitive 610 local_rtp_port 1 16 0 0 primitive 610 remote_rtp_port 1 16 0 0 primitive -610 remote_t38ip_addr_address_family 0 32 0 0 AddressFamily -610 remote_t38ip_addr 1 128 0 1 primitive +610 remote_t38ip_addr_address_family 0 32 0 1 AddressFamily +610 remote_t38ip_addr_ipv6_addr_0 1 32 0 1 primitive +610 remote_t38ip_addr_ipv6_addr_1 1 32 0 1 primitive +610 remote_t38ip_addr_ipv6_addr_2 1 32 0 1 primitive +610 remote_t38ip_addr_ipv6_addr_3 1 32 0 1 primitive 610 remote_t38_port 0 32 0 0 primitive 610 tx_rtp_payload_type 0 32 0 0 primitive 610 rx_rtp_payload_type 0 32 0 0 primitive @@ -14150,8 +14190,11 @@ FirmwareModule HA_MODULE_BOUNDARY 29 610 alignment1 1 8 0 0 primitive 610 remote_rtcp_port 1 16 0 0 primitive 610 alignment2 0 16 0 0 primitive -610 remote_rtcpip_addr_address_family 0 32 0 0 AddressFamily -610 remote_rtcpip_addr 1 128 0 1 primitive +610 remote_rtcpip_addr_address_family 0 32 0 1 AddressFamily +610 remote_rtcpip_addr_ipv6_addr_0 1 32 0 1 primitive +610 remote_rtcpip_addr_ipv6_addr_1 1 32 0 1 primitive +610 remote_rtcpip_addr_ipv6_addr_2 1 32 0 1 primitive +610 remote_rtcpip_addr_ipv6_addr_3 1 32 0 1 primitive 610 mediation_packet_format 0 32 0 0 MediationPacketFormat 610 packet_cable_call_content_connection_id 0 32 0 0 primitive 610 decoder_0 0 32 0 0 Decoder @@ -14170,10 +14213,16 @@ FirmwareModule HA_MODULE_BOUNDARY 29 610 video_tx_packetization_mode 1 8 0 0 primitive 610 video_rx_packetization_mode 1 8 0 0 primitive 610 alignment3 1 8 0 0 primitive -610 source_ip_address_family 0 32 0 0 AddressFamily -610 source_ip 0 128 0 1 primitive +610 source_ip_address_family 0 32 0 1 AddressFamily +610 source_ip_ipv6_addr_0 1 32 0 1 primitive +610 source_ip_ipv6_addr_1 1 32 0 1 primitive +610 source_ip_ipv6_addr_2 1 32 0 1 primitive +610 source_ip_ipv6_addr_3 1 32 0 1 primitive 610 remote_v1501ip_add_address_family 0 32 0 0 AddressFamily -610 remote_v1501ip_add 1 128 0 1 primitive +610 remote_v1501ip_add_ipv6_addr_0 1 32 0 1 primitive +610 remote_v1501ip_add_ipv6_addr_1 1 32 0 1 primitive +610 remote_v1501ip_add_ipv6_addr_2 1 32 0 1 primitive +610 remote_v1501ip_add_ipv6_addr_3 1 32 0 1 primitive 610 remote_v1501_port 1 16 0 0 primitive 610 alignment4 1 16 0 0 primitive 610 incoming_v1501_port_option 0 32 0 0 V1501RTPPortOption @@ -14201,11 +14250,17 @@ FirmwareModule HA_MODULE_BOUNDARY 29 610 state_update_time_stamp 1 32 0 0 primitive 611 channel_id 0 32 0 0 primitive 611 address_family 0 32 0 0 AddressFamily -611 ip_addr 1 128 0 1 primitive +611 ipv6_addr_0 1 32 0 1 primitive +611 ipv6_addr_1 1 32 0 1 primitive +611 ipv6_addr_2 1 32 0 1 primitive +611 ipv6_addr_3 1 32 0 1 primitive 611 local_rtp_port 1 16 0 0 primitive 611 remote_rtp_port 1 16 0 0 primitive -611 remote_t38ip_addr_address_family 0 32 0 0 AddressFamily -611 remote_t38ip_addr 1 128 0 1 primitive +611 remote_t38ip_addr_address_family 0 32 0 1 AddressFamily +611 remote_t38ip_addr_ipv6_addr_0 1 32 0 1 primitive +611 remote_t38ip_addr_ipv6_addr_1 1 32 0 1 primitive +611 remote_t38ip_addr_ipv6_addr_2 1 32 0 1 primitive +611 remote_t38ip_addr_ipv6_addr_3 1 32 0 1 primitive 611 remote_t38_port 0 32 0 0 primitive 611 tx_rtp_payload_type 0 32 0 0 primitive 611 rx_rtp_payload_type 0 32 0 0 primitive @@ -14218,8 +14273,11 @@ FirmwareModule HA_MODULE_BOUNDARY 29 611 alignment1 1 8 0 0 primitive 611 remote_rtcp_port 1 16 0 0 primitive 611 alignment2 0 16 0 0 primitive -611 remote_rtcpip_addr_address_family 0 32 0 0 AddressFamily -611 remote_rtcpip_addr 1 128 0 1 primitive +611 remote_rtcpip_addr_address_family 0 32 0 1 AddressFamily +611 remote_rtcpip_addr_ipv6_addr_0 1 32 0 1 primitive +611 remote_rtcpip_addr_ipv6_addr_1 1 32 0 1 primitive +611 remote_rtcpip_addr_ipv6_addr_2 1 32 0 1 primitive +611 remote_rtcpip_addr_ipv6_addr_3 1 32 0 1 primitive 611 mediation_packet_format 0 32 0 0 MediationPacketFormat 611 packet_cable_call_content_connection_id 0 32 0 0 primitive 611 decoder_0 0 32 0 0 Decoder @@ -14238,10 +14296,16 @@ FirmwareModule HA_MODULE_BOUNDARY 29 611 video_tx_packetization_mode 1 8 0 0 primitive 611 video_rx_packetization_mode 1 8 0 0 primitive 611 alignment3 1 8 0 0 primitive -611 source_ip_address_family 0 32 0 0 AddressFamily -611 source_ip 0 128 0 1 primitive +611 source_ip_address_family 0 32 0 1 AddressFamily +611 source_ip_ipv6_addr_0 1 32 0 1 primitive +611 source_ip_ipv6_addr_1 1 32 0 1 primitive +611 source_ip_ipv6_addr_2 1 32 0 1 primitive +611 source_ip_ipv6_addr_3 1 32 0 1 primitive 611 remote_v1501ip_add_address_family 0 32 0 0 AddressFamily -611 remote_v1501ip_add 1 128 0 1 primitive +611 remote_v1501ip_add_ipv6_addr_0 1 32 0 1 primitive +611 remote_v1501ip_add_ipv6_addr_1 1 32 0 1 primitive +611 remote_v1501ip_add_ipv6_addr_2 1 32 0 1 primitive +611 remote_v1501ip_add_ipv6_addr_3 1 32 0 1 primitive 611 remote_v1501_port 1 16 0 0 primitive 611 alignment4 1 16 0 0 primitive 611 incoming_v1501_port_option 0 32 0 0 V1501RTPPortOption @@ -14300,9 +14364,15 @@ FirmwareModule HA_MODULE_BOUNDARY 29 34 ip_tos_field_in_udp_packet 1 8 0 0 primitive 34 alignment1 1 8 0 0 primitive 34 address_family 0 32 0 0 AddressFamily -34 ip_addr 1 128 0 1 primitive -34 source_ip_address_family 0 32 0 0 AddressFamily -34 source_ip 0 128 0 1 primitive +34 ipv6_addr_0 1 32 0 1 primitive +34 ipv6_addr_1 1 32 0 1 primitive +34 ipv6_addr_2 1 32 0 1 primitive +34 ipv6_addr_3 1 32 0 1 primitive +34 source_ip_address_family 0 32 0 1 AddressFamily +34 source_ip_ipv6_addr_0 1 32 0 1 primitive +34 source_ip_ipv6_addr_1 1 32 0 1 primitive +34 source_ip_ipv6_addr_2 1 32 0 1 primitive +34 source_ip_ipv6_addr_3 1 32 0 1 primitive 34 t38_fax_session_immediate_start 1 8 0 0 primitive 34 alignment2 1 8 0 0 primitive 34 local_t38_port 1 16 0 0 primitive @@ -14513,13 +14583,25 @@ FirmwareModule HA_MODULE_BOUNDARY 29 1611 incoming_t38_port_option 1 8 0 0 primitive 1611 dummy2 1 8 0 0 primitive 1611 address_family 0 32 0 0 AddressFamily -1611 ip_addr 1 128 0 1 primitive -1611 remote_t38ip_add_address_family 0 32 0 0 AddressFamily -1611 remote_t38ip_add 1 128 0 1 primitive -1611 remote_rtcpip_add_address_family 0 32 0 0 AddressFamily -1611 remote_rtcpip_add 1 128 0 1 primitive -1611 local_ip_address_address_family 0 32 0 0 AddressFamily -1611 local_ip_address 0 128 0 1 primitive +1611 ipv6_addr_0 1 32 0 1 primitive +1611 ipv6_addr_1 1 32 0 1 primitive +1611 ipv6_addr_2 1 32 0 1 primitive +1611 ipv6_addr_3 1 32 0 1 primitive +1611 remote_t38ip_add_address_family 0 32 0 1 AddressFamily +1611 remote_t38ip_add_ipv6_addr_0 1 32 0 1 primitive +1611 remote_t38ip_add_ipv6_addr_1 1 32 0 1 primitive +1611 remote_t38ip_add_ipv6_addr_2 1 32 0 1 primitive +1611 remote_t38ip_add_ipv6_addr_3 1 32 0 1 primitive +1611 remote_rtcpip_add_address_family 0 32 0 1 AddressFamily +1611 remote_rtcpip_add_ipv6_addr_0 1 32 0 1 primitive +1611 remote_rtcpip_add_ipv6_addr_1 1 32 0 1 primitive +1611 remote_rtcpip_add_ipv6_addr_2 1 32 0 1 primitive +1611 remote_rtcpip_add_ipv6_addr_3 1 32 0 1 primitive +1611 local_ip_address_address_family 0 32 0 1 AddressFamily +1611 local_ip_address_ipv6_addr_0 1 32 0 1 primitive +1611 local_ip_address_ipv6_addr_1 1 32 0 1 primitive +1611 local_ip_address_ipv6_addr_2 1 32 0 1 primitive +1611 local_ip_address_ipv6_addr_3 1 32 0 1 primitive 1611 mpc_rmif_handle_mpe_handle 1 16 0 0 primitive 1611 handle 1 16 0 0 primitive 1611 ssrc 1 32 0 0 primitive @@ -14680,14 +14762,26 @@ FirmwareModule HA_MODULE_BOUNDARY 29 1611 activate_sbc_channel_incoming_rtcp_port_option 1 8 0 0 primitive 1611 activate_sbc_channel_incoming_t38_port_option 1 8 0 0 primitive 1611 activate_sbc_channel_dummy2 1 8 0 0 primitive -1611 remote_rtpip_add_address_family 0 32 0 0 AddressFamily -1611 remote_rtpip_add 1 128 0 1 primitive -1611 activate_sbc_channel_remote_t38ip_add_address_family 0 32 0 0 AddressFamily -1611 activate_sbc_channel_remote_t38ip_add 1 128 0 1 primitive -1611 activate_sbc_channel_remote_rtcpip_add_address_family 0 32 0 0 AddressFamily -1611 activate_sbc_channel_remote_rtcpip_add 1 128 0 1 primitive -1611 activate_sbc_channel_local_ip_address_address_family 0 32 0 0 AddressFamily -1611 activate_sbc_channel_local_ip_address 0 128 0 1 primitive +1611 remote_rtpip_add_address_family 0 32 0 1 AddressFamily +1611 remote_rtpip_add_ipv6_addr_0 1 32 0 1 primitive +1611 remote_rtpip_add_ipv6_addr_1 1 32 0 1 primitive +1611 remote_rtpip_add_ipv6_addr_2 1 32 0 1 primitive +1611 remote_rtpip_add_ipv6_addr_3 1 32 0 1 primitive +1611 activate_sbc_channel_remote_t38ip_add_address_family 0 32 0 1 AddressFamily +1611 activate_sbc_channel_remote_t38ip_add_ipv6_addr_0 1 32 0 1 primitive +1611 activate_sbc_channel_remote_t38ip_add_ipv6_addr_1 1 32 0 1 primitive +1611 activate_sbc_channel_remote_t38ip_add_ipv6_addr_2 1 32 0 1 primitive +1611 activate_sbc_channel_remote_t38ip_add_ipv6_addr_3 1 32 0 1 primitive +1611 activate_sbc_channel_remote_rtcpip_add_address_family 0 32 0 1 AddressFamily +1611 activate_sbc_channel_remote_rtcpip_add_ipv6_addr_0 1 32 0 1 primitive +1611 activate_sbc_channel_remote_rtcpip_add_ipv6_addr_1 1 32 0 1 primitive +1611 activate_sbc_channel_remote_rtcpip_add_ipv6_addr_2 1 32 0 1 primitive +1611 activate_sbc_channel_remote_rtcpip_add_ipv6_addr_3 1 32 0 1 primitive +1611 activate_sbc_channel_local_ip_address_address_family 0 32 0 1 AddressFamily +1611 activate_sbc_channel_local_ip_address_ipv6_addr_0 1 32 0 1 primitive +1611 activate_sbc_channel_local_ip_address_ipv6_addr_1 1 32 0 1 primitive +1611 activate_sbc_channel_local_ip_address_ipv6_addr_2 1 32 0 1 primitive +1611 activate_sbc_channel_local_ip_address_ipv6_addr_3 1 32 0 1 primitive 1611 activate_sbc_channel_mpc_rmif_handle_mpe_handle 1 16 0 0 primitive 1611 mpc_rmif_handle_handle 1 16 0 0 primitive 1611 activate_sbc_channel_ssrc 1 32 0 0 primitive |