From Jelmer Vernooij:

	OSCAR-ICQ updates;
	DCOM IRemUnknown and IRemUnknown2 support.

svn path=/trunk/; revision=11736

1 files changed, 56 insertions, 6 deletions

diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index 6fc357b2cd..36e11ffb54 100644
--- a/epan/dissectors/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.c
@@ -57,6 +57,21 @@ static const value_string aim_fnac_family_icq[] = {
   { 0, NULL }
 };
 
+#define ICQ_CLI_OFFLINE_MESSAGE_REQ 	0x003c
+#define ICQ_CLI_DELETE_OFFLINE_MSGS		0x003e
+#define ICQ_SRV_END_OF_OFFLINE_MSGS		0x0042
+#define ICQ_CLI_META_INFO_REQ			0x07d0
+#define ICQ_SRV_META_INFO_REPL			0x07da
+
+static const value_string aim_icq_data_types[] = {
+  { ICQ_CLI_OFFLINE_MESSAGE_REQ, "Offline Message Request" },
+  { ICQ_SRV_END_OF_OFFLINE_MSGS, "End Of Offline Messages Reply" },
+  { ICQ_CLI_DELETE_OFFLINE_MSGS, "Delete Offline Messages Request" },
+  { ICQ_CLI_META_INFO_REQ, "Metainfo Request" },
+  { ICQ_SRV_META_INFO_REPL, "Metainfo Reply" },
+  { 0, NULL }
+};
+
 int dissect_aim_tlv_value_icq(proto_item *ti, guint16, tvbuff_t *);
 
 #define TLV_ICQ_META_DATA 			  0x0001
@@ -71,10 +86,32 @@ static int proto_aim_icq = -1;
 
 /* Initialize the subtree pointers */
 static gint ett_aim_icq      = -1;
+static gint ett_aim_icq_tlv  = -1;
+
+
+static gint hf_icq_tlv_data_chunk_size = -1;
+static gint hf_icq_tlv_request_owner_uid = -1;
+static gint hf_icq_tlv_request_type = -1;
+static gint hf_icq_tlv_request_seq_num = -1;
 
 int dissect_aim_tlv_value_icq(proto_item *ti _U_, guint16 subtype _U_, tvbuff_t *tvb _U_)
 {
-	/* FIXME */
+	int offset = 0;
+	proto_tree *t = proto_item_add_subtree(ti, ett_aim_icq_tlv);
+
+	proto_tree_add_item(t, hf_icq_tlv_data_chunk_size, tvb, offset, 2, tvb_get_ntohs(tvb, offset));
+	offset += 2;
+	
+	proto_tree_add_item(t, hf_icq_tlv_request_owner_uid, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));
+	offset += 4;
+
+	proto_tree_add_item(t, hf_icq_tlv_request_type, tvb, offset, 2, tvb_get_ntohs(tvb, offset));
+	offset += 2;
+
+
+	proto_tree_add_item(t, hf_icq_tlv_request_seq_num, tvb, offset, 2, tvb_get_ntohs(tvb, offset));
+	offset += 2;
+
 	return 0;
 }
 
@@ -87,10 +124,10 @@ static int dissect_aim_icq(tvbuff_t *tvb, packet_info *pinfo,
    case FAMILY_ICQ_ERROR:
 	   return dissect_aim_snac_error(tvb, pinfo, offset, tree);
    case FAMILY_ICQ_LOGINREQUEST:
-	   return dissect_aim_tlv(tvb, pinfo, offset, tree, icq_tlv);
    case FAMILY_ICQ_LOGINRESPONSE:
+	   return dissect_aim_tlv(tvb, pinfo, offset, tree, icq_tlv);
    case FAMILY_ICQ_AUTHREQUEST:
-	case FAMILY_ICQ_AUTHRESPONSE:
+   case FAMILY_ICQ_AUTHRESPONSE:
 	   /* FIXME */
 	default:
 	   return 0;
@@ -103,19 +140,32 @@ proto_register_aim_icq(void)
 {
 
 /* Setup list of header fields */
-/*  static hf_register_info hf[] = {
-  };*/
+  static hf_register_info hf[] = {
+	  { &hf_icq_tlv_data_chunk_size,
+	    { "Data chunk size", "aim_icq.chunk_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+	  },
+	  { &hf_icq_tlv_request_owner_uid,
+	    { "Owner UID", "aim_icq.owner_uid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL},
+	  },
+	  { &hf_icq_tlv_request_type,
+	    {"Request Type", "aim_icq.request_type", FT_UINT16, BASE_DEC, VALS(aim_icq_data_types), 0x0, "", HFILL},
+	  },
+	  { &hf_icq_tlv_request_seq_num,
+	    {"Request Sequence Number", "aim_icq.request_seq_number", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL},
+	  },
+  };
 
 /* Setup protocol subtree array */
   static gint *ett[] = {
     &ett_aim_icq,
+	&ett_aim_icq_tlv
   };
 
 /* Register the protocol name and description */
   proto_aim_icq = proto_register_protocol("AIM ICQ", "AIM ICQ", "aim_icq");
 
 /* Required function calls to register the header fields and subtrees used */
-  /*proto_register_field_array(proto_aim_icq, hf, array_length(hf));*/
+  proto_register_field_array(proto_aim_icq, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }