-
- ti = proto_tree_add_item(tree, proto_imap, NullTVB, offset, END_OF_FRAME, FALSE);
- imap_tree = proto_item_add_subtree(ti, ett_imap);
-
- if (pi.match_port == pi.destport) { /* Request */
-
- proto_tree_add_boolean_hidden(imap_tree, hf_imap_request, NullTVB, offset, i1, TRUE);
- proto_tree_add_text(imap_tree, NullTVB, offset, i1, "Request Tag: %s", rr);
-
- proto_tree_add_text(imap_tree, NullTVB, offset + i1 + 1, END_OF_FRAME, "Request: %s", rd);
-
- }
- else {
-
- proto_tree_add_boolean_hidden(imap_tree, hf_imap_response, NullTVB, offset, i1, TRUE);
- proto_tree_add_text(imap_tree, NullTVB, offset, i1, "Response Tag: %s", rr);
-
- proto_tree_add_text(imap_tree, NullTVB, offset + i1 + 1, END_OF_FRAME, "Response: %s", rd);
- }
-
+ ti = proto_tree_add_item(tree, proto_imap, tvb, offset,
+ tvb_length_remaining(tvb, offset), FALSE);
+ imap_tree = proto_item_add_subtree(ti, ett_imap);
+
+ if (is_request) {
+ proto_tree_add_boolean_hidden(imap_tree,
+ hf_imap_request, tvb, 0, 0, TRUE);
+ } else {
+ proto_tree_add_boolean_hidden(imap_tree,
+ hf_imap_response, tvb, 0, 0, TRUE);
+ }
+
+ /*
+ * Show the first line as tags + requests or replies.
+ */
+
+ /*
+ * Extract the first token, and, if there is a first
+ * token, add it as the request or reply tag.
+ */
+ tokenlen = get_token_len(line, line + linelen, &next_token);
+ if (tokenlen != 0) {
+ if (is_request) {
+ proto_tree_add_text(imap_tree, tvb, offset,
+ tokenlen, "Request Tag: %s",
+ format_text(line, tokenlen));
+ } else {
+ proto_tree_add_text(imap_tree, tvb, offset,
+ tokenlen, "Response Tag: %s",
+ format_text(line, tokenlen));
+ }
+ offset += next_token - line;
+ linelen -= next_token - line;
+ line = next_token;
+ }
+
+ /*
+ * Add the rest of the line as request or reply data.
+ */
+ if (linelen != 0) {
+ if (is_request) {
+ proto_tree_add_text(imap_tree, tvb, offset,
+ linelen, "Request: %s",
+ format_text(line, linelen));
+ } else {
+ proto_tree_add_text(imap_tree, tvb, offset,
+ linelen, "Response: %s",
+ format_text(line, linelen));
+ }
+ }
+
+ /*
+ * XXX - show the rest of the frame; this requires that
+ * we handle literals, quoted strings, continuation
+ * responses, etc..
+ *
+ * This involves a state machine, and attaching
+ * state information to the packets.
+ */