osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

TPNCP: Show IPv6 correctly 

Change-Id: I6c4ee9190f4cfc6d073857999b2bc6859cad591b
Reviewed-on: https://code.wireshark.org/review/36044
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Orgad Shaneh 2020-02-07 11:18:06 +02:00 committed by Anders Broman
parent 9d185416da
commit f307dcc1d4
2 changed files with 109 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
epan/dissectors/packet-tpncp.c
View File

@ -51,10 +51,12 @@ typedef struct tpncp_data_field_info
{
gchar *tpncp_data_field_name;
gint tpncp_data_field_descr;
gint tpncp_ipv6_data_field_descr;
gint tpncp_data_field_sign;
gint tpncp_data_field_size;
gint tpncp_data_field_array_dim;
gint tpncp_data_field_is_ip_addr;
gint tpncp_data_field_is_address_family;
struct tpncp_data_field_info *p_next;
} tpncp_data_field_info;
@ -110,6 +112,11 @@ static gboolean db_initialized = FALSE;
/*---------------------------------------------------------------------------*/
enum AddressFamily {
TPNCP_IPV4 = 2,
TPNCP_IPV6 = 28
};
static void
dissect_tpncp_data(guint data_id, packet_info *pinfo, tvbuff_t *tvb, proto_tree *ltree,
gint *offset, tpncp_data_field_info *data_fields_info, guint encoding)
@ -119,6 +126,7 @@ dissect_tpncp_data(guint data_id, packet_info *pinfo, tvbuff_t *tvb, proto_tree
gint g_str_len, counter, bitshift, bitmask;
tpncp_data_field_info *current_tpncp_data_field_info = NULL;
gint bitindex = encoding == ENC_LITTLE_ENDIAN ? 7 : 0;
enum AddressFamily address_family = TPNCP_IPV4;
current_tpncp_data_field_info = &data_fields_info[data_id];
@ -173,8 +181,22 @@ dissect_tpncp_data(guint data_id, packet_info *pinfo, tvbuff_t *tvb, proto_tree
case 32:
proto_tree_add_item(ltree, current_tpncp_data_field_info->tpncp_data_field_descr,
tvb, *offset, 4, encoding);
if (current_tpncp_data_field_info->tpncp_data_field_is_address_family)
address_family = (enum AddressFamily)tvb_get_guint32(tvb, *offset, encoding);
(*offset) += 4;
break;
case 128:
if (current_tpncp_data_field_info->tpncp_data_field_is_ip_addr) {
if (address_family == TPNCP_IPV6) {
proto_tree_add_item(ltree, current_tpncp_data_field_info->tpncp_ipv6_data_field_descr,
tvb, *offset, 16, encoding);
} else {
proto_tree_add_item(ltree, current_tpncp_data_field_info->tpncp_data_field_descr,
tvb, *offset, 4, encoding);
}
}
(*offset) += 16;
break;
default:
break;
}
@ -414,6 +436,21 @@ get_enum_name_val(const gchar *enum_name)
/*---------------------------------------------------------------------------*/
static gboolean add_hf(hf_register_info *hf_entr)
{
if (hf_size > hf_allocated) {
void *newbuf;
hf_allocated += 1024;
newbuf = wmem_realloc(wmem_epan_scope(), hf, hf_allocated * sizeof (hf_register_info));
if (!newbuf)
return FALSE;
hf = (hf_register_info *) newbuf;
}
memcpy(hf + hf_size - 1, hf_entr, sizeof (hf_register_info));
hf_size++;
return TRUE;
}
static gint
init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, FILE *file)
{
@ -422,7 +459,7 @@ init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, FILE *file)
gchar entry_copy[MAX_TPNCP_DB_ENTRY_LEN];
const gchar *tpncp_data_field_name = NULL, *tmp = NULL;
gint enum_val, data_id, current_data_id = -1, tpncp_data_field_sign, tpncp_data_field_size,
tpncp_data_field_array_dim, tpncp_data_field_is_ip_addr;
tpncp_data_field_array_dim, tpncp_data_field_is_ip_addr, tpncp_data_field_is_address_family;
guint idx;
tpncp_data_field_info *current_tpncp_data_field_info = NULL;
hf_register_info hf_entr;
@ -616,6 +653,7 @@ init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, FILE *file)
continue;
}
tpncp_data_field_is_address_family = FALSE;
if (current_data_id != data_id) { /* new data */
if (registered_struct_ids[data_id] == TRUE) {
report_failure(
@ -638,14 +676,18 @@ init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, FILE *file)
/* Register specific fields of hf_register_info struture. */
if (strcmp(tmp, "primitive")) {
enum_val = get_enum_name_val(tmp);
if (enum_val == -1)
if (enum_val == -1) {
hf_entr.hfinfo.strings = NULL;
else
} else {
hf_entr.hfinfo.strings = VALS(tpncp_enums_id_vals[enum_val]);
if (!strcmp(tmp, "AddressFamily"))
tpncp_data_field_is_address_family = TRUE;
}
} else {
hf_entr.hfinfo.strings = NULL;
}
current_tpncp_data_field_info->tpncp_data_field_descr = -1;
current_tpncp_data_field_info->tpncp_ipv6_data_field_descr = -1;
hf_entr.p_id = &current_tpncp_data_field_info->tpncp_data_field_descr;
current_tpncp_data_field_info->tpncp_data_field_name =
wmem_strdup_printf(wmem_epan_scope(), "tpncp.%s", tpncp_data_field_name);
@ -672,25 +714,28 @@ init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, FILE *file)
hf_entr.hfinfo.type = (tpncp_data_field_sign) ? FT_UINT32 : FT_INT32;
}
break;
case 128:
if (tpncp_data_field_is_ip_addr) {
hf_entr.hfinfo.display = BASE_NONE;
hf_entr.hfinfo.type = FT_IPv4;
if (!add_hf(&hf_entr))
return -1;
hf_entr.p_id = &current_tpncp_data_field_info->tpncp_ipv6_data_field_descr;
hf_entr.hfinfo.type = FT_IPv6;
}
break;
default:
break;
}
/* Register initialized hf_register_info in global database. */
if (hf_size > hf_allocated) {
void *newbuf;
hf_allocated += 1024;
newbuf = wmem_realloc(wmem_epan_scope(), hf, hf_allocated * sizeof (hf_register_info));
if (!newbuf)
return -1;
hf = (hf_register_info *) newbuf;
}
memcpy(hf + hf_size - 1, &hf_entr, sizeof (hf_register_info));
hf_size++;
if (!add_hf(&hf_entr))
return -1;
current_tpncp_data_field_info->tpncp_data_field_sign = tpncp_data_field_sign;
current_tpncp_data_field_info->tpncp_data_field_size = tpncp_data_field_size;
current_tpncp_data_field_info->tpncp_data_field_array_dim = tpncp_data_field_array_dim;
current_tpncp_data_field_info->tpncp_data_field_is_ip_addr = tpncp_data_field_is_ip_addr;
current_tpncp_data_field_info->tpncp_data_field_is_address_family = tpncp_data_field_is_address_family;
}
return 0;

195
tpncp/tpncp.dat
View File

@ -10048,10 +10048,7 @@ 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 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 ip_addr 1 128 0 1 primitive
454 port 0 32 0 0 primitive
454 body_len 0 32 0 0 primitive
454 body_hndle 0 32 0 0 primitive
@ -10062,15 +10059,9 @@ 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 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 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 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
@ -10456,10 +10447,7 @@ 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 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
661 ip_addr 1 128 0 1 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
@ -14099,46 +14087,25 @@ 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 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 ip_addr 1 128 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 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 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 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_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_v1501ip_add 1 128 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
@ -14166,17 +14133,11 @@ 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 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 ip_addr 1 128 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 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_t38ip_addr_address_family 0 32 0 0 AddressFamily
610 remote_t38ip_addr 1 128 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
@ -14189,11 +14150,8 @@ 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 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 remote_rtcpip_addr_address_family 0 32 0 0 AddressFamily
610 remote_rtcpip_addr 1 128 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
@ -14212,16 +14170,10 @@ 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 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 source_ip_address_family 0 32 0 0 AddressFamily
610 source_ip 0 128 0 1 primitive
610 remote_v1501ip_add_address_family 0 32 0 0 AddressFamily
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_v1501ip_add 1 128 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
@ -14249,17 +14201,11 @@ 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 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 ip_addr 1 128 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 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_t38ip_addr_address_family 0 32 0 0 AddressFamily
611 remote_t38ip_addr 1 128 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
@ -14272,11 +14218,8 @@ 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 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 remote_rtcpip_addr_address_family 0 32 0 0 AddressFamily
611 remote_rtcpip_addr 1 128 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
@ -14295,16 +14238,10 @@ 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 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 source_ip_address_family 0 32 0 0 AddressFamily
611 source_ip 0 128 0 1 primitive
611 remote_v1501ip_add_address_family 0 32 0 0 AddressFamily
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_v1501ip_add 1 128 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
@ -14363,15 +14300,9 @@ 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 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 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 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
@ -14582,25 +14513,13 @@ 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 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 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 mpc_rmif_handle_mpe_handle 1 16 0 0 primitive
1611 handle 1 16 0 0 primitive
1611 ssrc 1 32 0 0 primitive
@ -14761,26 +14680,14 @@ 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 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 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 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