Use END_OF_FRAME rather than "fd->cap_len - offset" - END_OF_FRAME used

to be just "fd->cap_len - offset", but it's now "pi.captured_len - offset",
which means that, for a protocol built atop TCP, like LPD, it'll take
into account the fact that the IP (and thus TCP) data in the packet may
end before the end of the frame.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@579 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-lpd.c b/packet-lpd.c
index e4718488fbf4f22cf486de7d0c350df783c941e9..016076cfe04e14c3c175b774d171429595394c45 100644 (file)
--- a/packet-lpd.c
+++ b/packet-lpd.c
@@ -2,7 +2,7 @@
  * Routines for LPR and LPRng packet disassembly
  * Gilbert Ramirez <gram@verdict.uthscsa.edu>
  *
- * $Id: packet-lpd.c,v 1.8 1999/07/07 22:51:47 gram Exp $
+ * $Id: packet-lpd.c,v 1.9 1999/08/25 17:38:36 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -93,7 +93,7 @@ dissect_lpd(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
        }
 
        if (tree) {
-               ti = proto_tree_add_text(tree, offset, fd->cap_len - offset,
+               ti = proto_tree_add_text(tree, offset, END_OF_FRAME,
                  "Line Printer Daemon Protocol");
                lpd_tree = proto_item_add_subtree(ti, ETT_LPD);
 
@@ -109,10 +109,11 @@ dissect_lpd(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
                        printer = g_strdup(&pd[offset+1]);
 
                        /* get rid of the new-line so that the tree prints out nicely */
-                       if (printer[fd->cap_len - offset - 2] == 0x0a) {
-                               printer[fd->cap_len - offset - 2] = 0;
+                       if (printer[END_OF_FRAME - 2] == 0x0a) {
+                               printer[END_OF_FRAME - 2] = 0;
                        }
-                       proto_tree_add_text(lpd_tree, offset+1, fd->cap_len - (offset+1),
+                       proto_tree_add_text(lpd_tree, offset+1,
+                                       END_OF_FRAME - 1,
                                        /*"Printer/options: %s", &pd[offset+1]);*/
                                        "Printer/options: %s", printer);
                        g_free(printer);
@@ -126,11 +127,11 @@ dissect_lpd(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
                                printer = strdup(&pd[offset]);
                                line_pos = printer;
                                curr_offset = offset;
-                               while (fd->cap_len > curr_offset) {
+                               while (pi.captured_len > curr_offset) {
                                        newline = strchr(line_pos, '\n');
                                        if (!newline) {
                                                proto_tree_add_text(lpd_tree, curr_offset,
-                                                       fd->cap_len - offset, "Text: %s", line_pos);
+                                                       END_OF_FRAME, "Text: %s", line_pos);
                                                break;
                                        }
                                        *newline = 0;