diff options
Diffstat (limited to 'epan/dissectors/packet-paltalk.c')
| -rw-r--r-- | epan/dissectors/packet-paltalk.c | 128 |
1 files changed, 64 insertions, 64 deletions
diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c index cddfc6a140..4983e3230b 100644 --- a/epan/dissectors/packet-paltalk.c +++ b/epan/dissectors/packet-paltalk.c @@ -53,86 +53,86 @@ static gint ett_paltalk = -1; static guint dissect_paltalk_get_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) { - return tvb_get_ntohs(tvb, offset + 4) + PALTALK_HEADER_LENGTH; + return tvb_get_ntohs(tvb, offset + 4) + PALTALK_HEADER_LENGTH; } static int dissect_paltalk_desegmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - proto_item *ti = NULL; - proto_tree *pt_tree = NULL; - - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Paltalk"); - col_clear(pinfo->cinfo, COL_INFO); - - if (tree) /* we are being asked for details */ - { - ti = proto_tree_add_item(tree, proto_paltalk, tvb, 0, -1, ENC_NA); - pt_tree = proto_item_add_subtree(ti, ett_paltalk); - proto_tree_add_item(pt_tree, hf_paltalk_pdu_type, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(pt_tree, hf_paltalk_version, tvb, 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(pt_tree, hf_paltalk_length, tvb, 4, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(pt_tree, hf_paltalk_content, tvb, 6, tvb_get_ntohs(tvb, 4), ENC_NA); - } - - return tvb_captured_length(tvb); + proto_item *ti = NULL; + proto_tree *pt_tree = NULL; + + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Paltalk"); + col_clear(pinfo->cinfo, COL_INFO); + + if (tree) /* we are being asked for details */ + { + ti = proto_tree_add_item(tree, proto_paltalk, tvb, 0, -1, ENC_NA); + pt_tree = proto_item_add_subtree(ti, ett_paltalk); + proto_tree_add_item(pt_tree, hf_paltalk_pdu_type, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pt_tree, hf_paltalk_version, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pt_tree, hf_paltalk_length, tvb, 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(pt_tree, hf_paltalk_content, tvb, 6, tvb_get_ntohs(tvb, 4), ENC_NA); + } + + return tvb_captured_length(tvb); } static gboolean dissect_paltalk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - guint32 src32, dst32; - - /* Detect if this TCP session is a Paltalk one */ - /* TODO: Optimize detection logic if possible */ - - if ((pinfo->net_src.type != AT_IPv4) - || (pinfo->net_dst.type != AT_IPv4) - || (pinfo->net_src.len != 4) - || (pinfo->net_dst.len != 4) - || !pinfo->net_src.data - || !pinfo->net_dst.data) - return FALSE; - - memcpy((guint8 *)&src32, pinfo->net_src.data, 4); /* *Network* order */ - memcpy((guint8 *)&dst32, pinfo->net_dst.data, 4); /* *Network* order */ - - if ( ((src32 & PALTALK_SERVERS_NETMASK) != PALTALK_SERVERS_ADDRESS) - && - ((dst32 & PALTALK_SERVERS_NETMASK) != PALTALK_SERVERS_ADDRESS)) - return FALSE; - - /* Dissect result of desegmented TCP data */ - tcp_dissect_pdus(tvb, pinfo, tree, TRUE, PALTALK_HEADER_LENGTH, - dissect_paltalk_get_len, dissect_paltalk_desegmented, data); - return TRUE; + guint32 src32, dst32; + + /* Detect if this TCP session is a Paltalk one */ + /* TODO: Optimize detection logic if possible */ + + if ((pinfo->net_src.type != AT_IPv4) + || (pinfo->net_dst.type != AT_IPv4) + || (pinfo->net_src.len != 4) + || (pinfo->net_dst.len != 4) + || !pinfo->net_src.data + || !pinfo->net_dst.data) + return FALSE; + + memcpy((guint8 *)&src32, pinfo->net_src.data, 4); /* *Network* order */ + memcpy((guint8 *)&dst32, pinfo->net_dst.data, 4); /* *Network* order */ + + if ( ((src32 & PALTALK_SERVERS_NETMASK) != PALTALK_SERVERS_ADDRESS) + && + ((dst32 & PALTALK_SERVERS_NETMASK) != PALTALK_SERVERS_ADDRESS)) + return FALSE; + + /* Dissect result of desegmented TCP data */ + tcp_dissect_pdus(tvb, pinfo, tree, TRUE, PALTALK_HEADER_LENGTH, + dissect_paltalk_get_len, dissect_paltalk_desegmented, data); + return TRUE; } void proto_register_paltalk(void) { - static hf_register_info hf[] = { - { &hf_paltalk_pdu_type, { "Packet Type", "paltalk.type", - FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }}, - { &hf_paltalk_version, { "Protocol Version", "paltalk.version", - FT_INT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, - { &hf_paltalk_length, { "Payload Length", "paltalk.length", - FT_INT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, - { &hf_paltalk_content, { "Payload Content", "paltalk.content", - FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }} - }; - - static gint *ett[] = { &ett_paltalk }; - - proto_paltalk = proto_register_protocol("Paltalk Messenger Protocol", "Paltalk", "paltalk"); - proto_register_field_array(proto_paltalk, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + static hf_register_info hf[] = { + { &hf_paltalk_pdu_type, { "Packet Type", "paltalk.type", + FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }}, + { &hf_paltalk_version, { "Protocol Version", "paltalk.version", + FT_INT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, + { &hf_paltalk_length, { "Payload Length", "paltalk.length", + FT_INT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, + { &hf_paltalk_content, { "Payload Content", "paltalk.content", + FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }} + }; + + static gint *ett[] = { &ett_paltalk }; + + proto_paltalk = proto_register_protocol("Paltalk Messenger Protocol", "Paltalk", "paltalk"); + proto_register_field_array(proto_paltalk, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } void proto_reg_handoff_paltalk(void) { - heur_dissector_add("tcp", dissect_paltalk, proto_paltalk); + heur_dissector_add("tcp", dissect_paltalk, proto_paltalk); } /* @@ -140,10 +140,10 @@ proto_reg_handoff_paltalk(void) * * Local variables: * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: t + * tab-width: 8 + * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 noexpandtab: - * :indentSize=4:tabSize=4:noTabs=false: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ |