various string related changes, mainly replace sprintf/snprintf by g_snprintf

[obnox/wireshark/wip.git] / packet-nntp.c

diff --git a/packet-nntp.c b/packet-nntp.c
index 5d2580965d84b0b104c22a17eb7f2b49f1d18e92..1311546d8700dc73dee33c596157274b5410f083 100644 (file)
--- a/packet-nntp.c
+++ b/packet-nntp.c
@@ -2,22 +2,22 @@
  * Routines for nntp packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-nntp.c,v 1.14 2000/11/09 10:56:32 guy Exp $
+ * $Id: packet-nntp.c,v 1.27 2002/08/28 21:00:24 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -29,18 +29,10 @@
 
 #include <stdio.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <string.h>
 #include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
 
 static int proto_nntp = -1;
 static int hf_nntp_response = -1;
@@ -57,36 +49,35 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_tree      *nntp_tree;
        proto_item      *ti;
        gint            offset = 0;
-       const u_char    *line;
        gint            next_offset;
        int             linelen;
 
-       CHECK_DISPLAY_AS_DATA(proto_nntp, tvb, pinfo, tree);
-
         if (pinfo->match_port == pinfo->destport)
                type = "Request";
         else
                type = "Response";
 
-       pinfo->current_proto = "NNTP";
+       if (check_col(pinfo->cinfo, COL_PROTOCOL))
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "NNTP");
 
-       if (check_col(pinfo->fd, COL_PROTOCOL))
-               col_add_str(pinfo->fd, COL_PROTOCOL, "NNTP");
-
-       if (check_col(pinfo->fd, COL_INFO)) {
+       if (check_col(pinfo->cinfo, COL_INFO)) {
                /*
                 * Put the first line from the buffer into the summary
                 * (but leave out the line terminator).
+                *
+                * Note that "tvb_find_line_end()" will return a value that
+                * is not longer than what's in the buffer, so the
+                * "tvb_get_ptr()" call won't throw an exception.
                 */
-               linelen = tvb_find_line_end(tvb, offset, -1, &next_offset);
-               line = tvb_get_ptr(tvb, offset, linelen);
-               col_add_fstr(pinfo->fd, COL_INFO, "%s: %s", type,
-                   format_text(line, linelen));
+               linelen = tvb_find_line_end(tvb, offset, -1, &next_offset,
+                   FALSE);
+               col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", type,
+                   tvb_format_text(tvb, offset, linelen));
        }
 
        if (tree) {
-               ti = proto_tree_add_item(tree, proto_nntp, tvb, offset,
-                   tvb_length_remaining(tvb, offset), FALSE);
+               ti = proto_tree_add_item(tree, proto_nntp, tvb, offset, -1,
+                   FALSE);
                nntp_tree = proto_item_add_subtree(ti, ett_nntp);
 
                if (pinfo->match_port == pinfo->destport) {
@@ -105,11 +96,12 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 * matching request was, although the latter requires us to
                 * know what the matching request was....
                 */
-               while (tvb_length_remaining(tvb, offset)) {
+               while (tvb_offset_exists(tvb, offset)) {
                        /*
                         * Find the end of the line.
                         */
-                       tvb_find_line_end(tvb, offset, -1, &next_offset);
+                       tvb_find_line_end(tvb, offset, -1, &next_offset,
+                           FALSE);
 
                        /*
                         * Put this line.
@@ -129,19 +121,19 @@ proto_register_nntp(void)
            { &hf_nntp_response,
              { "Response",           "nntp.response",
                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-               "TRUE if NNTP response" }},
+               "TRUE if NNTP response", HFILL }},
 
            { &hf_nntp_request,
              { "Request",            "nntp.request",
                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-               "TRUE if NNTP request" }}
+               "TRUE if NNTP request", HFILL }}
        };
        static gint *ett[] = {
                &ett_nntp,
        };
 
-       proto_nntp = proto_register_protocol("Network News Transfer Protocol", 
-                                      "nntp");
+       proto_nntp = proto_register_protocol("Network News Transfer Protocol",
+           "NNTP", "nntp");
        proto_register_field_array(proto_nntp, hf, array_length(hf));
        proto_register_subtree_array(ett, array_length(ett));
 }
@@ -149,5 +141,8 @@ proto_register_nntp(void)
 void
 proto_reg_handoff_nntp(void)
 {
-       dissector_add("tcp.port", TCP_PORT_NNTP, dissect_nntp);
+       dissector_handle_t nntp_handle;
+
+       nntp_handle = create_dissector_handle(dissect_nntp, proto_nntp);
+       dissector_add("tcp.port", TCP_PORT_NNTP, nntp_handle);
 }