From cjs 2895: get rid of C++ comments, so IBM's Visual Age C compiler

can compile the code.

Note that Bill Fumerola rewrote the Cisco NetFlow dissector.

Update a bunch of addresses in the Ethereal man page, and put some
missing addresses in.

svn path=/trunk/; revision=6380

4 files changed, 28 insertions, 19 deletions

diff --git a/AUTHORS b/AUTHORS
index 562ddabf22..c3428d5cc3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,7 +26,7 @@ Hannes R. Boehm      <hannes[AT]boehm.org> {
     CDP (Cisco Discover Protocol Version 1)
 }
 
-Mike Hall            <mlh[AT]io.com>{
+Mike Hall            <mlh[AT]io.com> {
     TCP Follow
 }
 
@@ -1292,6 +1292,7 @@ Peter Hawkins <peter[AT]hawkins.emu.id.au> {
 
 Bill Fumerola <billf[AT]FreeBSD.org> {
 	Recognize "Option negotiated failed" error in TFTP
+	Rewritten Cisco NetFlow protocol support
 }
 
 Chris Waters <chris[AT]waters.co.nz> {
@@ -1413,7 +1414,7 @@ Ulf Lamping <ulf.lamping[AT]web.de> {
 }
 
 Matthew Smart <smart[AT]monkey.org> {
-	Cisco NetFlow protocol support
+	Original Cisco NetFlow protocol support
 }
 
 Jamie Fournier <jafour1[AT]yahoo.com> {
@@ -1448,6 +1449,10 @@ Brad Hards <bhards[AT]bigpond.net.au> {
 	Support for SRVLOC v2
 }
 
+cjs 2895 <cjs2895[AT]hotmail.com> {
+	Compile fixes for IBM's C compiler for AIX
+}
+
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 8f73178033..847d364de7 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1310,7 +1310,7 @@ B<http://www.ethereal.com>.
   Joerg Mayer              <jmayer[AT]loplof.de>
   Martin Maciaszek         <fastjack[AT]i-s-o.net>
   Didier Jorand            <Didier.Jorand[AT]alcatel.fr>
-  Jun-ichiro itojun Hagino <itojun[AT]iijlab.net>
+  Jun-ichiro itojun Hagino <itojun[AT]itojun.org>
   Richard Sharpe           <sharpe[AT]ns.aus.com>
   John McDermott           <jjm[AT]jkintl.com> 
   Jeff Jahr                <jjahr[AT]shastanets.com>
@@ -1321,7 +1321,7 @@ B<http://www.ethereal.com>.
   Johan Feyaerts           <Johan.Feyaerts[AT]siemens.atea.be>
   Olivier Abad             <oabad[AT]noos.fr>
   Thierry Andry            <Thierry.Andry[AT]advalvas.be>
-  Jeff Foster              <jjfoste[AT]woodward.com>
+  Jeff Foster              <jfoste[AT]woodward.com>
   Peter Torvals            <petertv[AT]xoommail.com>
   Christophe Tronche       <ch.tronche[AT]computer.org>
   Nathan Neulinger         <nneul[AT]umr.edu>
@@ -1341,7 +1341,7 @@ B<http://www.ethereal.com>.
   Thomas Parvais           <thomas.parvais[AT]advalvas.be>
   Gerrit Gehnen            <G.Gehnen[AT]atrie.de>
   Craig Newell             <craign[AT]cheque.uq.edu.au>
-  Ed Meaney                <emeaney[AT]altiga.com>
+  Ed Meaney                <emeaney[AT]cisco.com>
   Dietmar Petras           <DPetras[AT]ELSA.de> 
   Fred Reimer              <fwr[AT]ga.prestige.net>
   Florian Lohoff           <flo[AT]rfc822.org>
@@ -1353,7 +1353,7 @@ B<http://www.ethereal.com>.
   Graham Bloice            <graham.bloice[AT]trihedral.com>
   Ralf Schneider           <ralf.schneider[AT]alcatel.se>
   Yaniv Kaul               <ykaul[AT]netvision.net.il>
-  Paul Ionescu             <ipaul[AT]romsys.ro>
+  Paul Ionescu             <paul[AT]acorp.ro>
   Mark Burton              <markb[AT]ordern.com>
   Stefan Raab              <sraab[AT]cisco.com>
   Mark Clayton             <clayton[AT]shore.net>
@@ -1380,13 +1380,14 @@ B<http://www.ethereal.com>.
   Johan Jorgensen          <johan.jorgensen[AT]axis.com>
   Frank Singleton          <frank.singleton[AT]ericsson.com>
   Kevin Shi                <techishi[AT]ms22.hinet.net>
-  Mike Frisch              <mfrisch[AT]saturn.tlug.org>
+  Mike Frisch              <mfrisch[AT]isurfer.ca>
   Burke Lau                <burke_lau[AT]agilent.com>
   Martti Kuparinen         <martti.kuparinen[AT]iki.fi>
   David Hampton            <dhampton[AT]mac.com>
   Kent Engström            <kent[AT]unit.liu.se>
-  Ronnie Sahlberg          <rsahlber[AT]bigpond.net.au>
-  Alexandre P. Ferreira    <alexandref[AT]spliceip.com.br>
+  Ronnie Sahlberg          <sahlberg[AT]optushome.com.au>
+  Borosa Tomislav          <tomislav.borosa[AT]SIEMENS.HR>
+  Alexandre P. Ferreira    <alexandref[AT]tcoip.com.br>
   Simharajan Srishylam     <Simharajan.Srishylam[AT]netapp.com>
   Greg Kilfoyle            <gregk[AT]redback.com>
   James E. Flemer          <jflemer[AT]acm.jhu.edu>
@@ -1406,7 +1407,6 @@ B<http://www.ethereal.com>.
   Martin Held              <Martin.Held[AT]icn.siemens.de>
   Riaan Swart              <rswart[AT]cs.sun.ac.za>
   Christian Lacunza        <celacunza[AT]gmx.net>
-  Michael Rozhavsky        <mike[AT]tochna.technion.ac.il>
   Scott Renfro             <scott[AT]renfro.org>
   Juan Toledo              <toledo[AT]users.sourceforge.net>
   Jean-Christian Pennetier <jeanchristian.pennetier[AT]rd.francetelecom.fr>
@@ -1431,7 +1431,7 @@ B<http://www.ethereal.com>.
   Lee Berger               <lberger[AT]roy.org>
   Motonori Shindo          <mshindo[AT]mshindo.net>
   Terje Krogdahl           <tekr[AT]nextra.com>
-  Jean-Francois Mule       <jfmule[AT]clarent.com>
+  Jean-Francois Mule       <jfm[AT]cablelabs.com>
   Thomas Wittwer           <thomas.wittwer[AT]iclip.ch>
   Matthias Nyffenegger     <matthias.nyffenegger[AT]iclip.ch>
   Palle Lyckegaard         <Palle[AT]lyckegaard.dk>
@@ -1534,9 +1534,13 @@ B<http://www.ethereal.com>.
   Marcus Haebler           <haeblerm[AT]yahoo.com>
   Ulf Lamping              <ulf.lamping[AT]web.de>
   Matthew Smart            <smart[AT]monkey.org>
+  Luke Howard              <lukeh[AT]au.padl.com>
   PC Drew                  <drewpc[AT]ibsncentral.com>
+  Renzo Tomas              <renzo.toma [AT] xs4all.nl>
   Clive A. Stubbings       <eth[AT]vjet.demon.co.uk>
-
+  Steve Langasek           <vorlon [AT] netexpress.net>
+  Brad Hards               <bhards[AT]bigpond.net.au>
+  cjs 2895                 <cjs2895[AT]hotmail.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.
diff --git a/packet-bpdu.c b/packet-bpdu.c
index 90cdf2381a..c93ff583db 100644
--- a/packet-bpdu.c
+++ b/packet-bpdu.c
@@ -1,7 +1,7 @@
 /* packet-bpdu.c
  * Routines for BPDU (Spanning Tree Protocol) disassembly
  *
- * $Id: packet-bpdu.c,v 1.40 2002/09/25 00:48:53 jmayer Exp $
+ * $Id: packet-bpdu.c,v 1.41 2002/10/08 19:18:57 guy Exp $
  *
  * Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
  *
@@ -134,9 +134,9 @@ static const value_string protocol_id_vals[] = {
 	{ 0, NULL }
 };
 
-#define BPDU_TYPE_CONF			0x00	// STP Configuration BPDU
-#define BPDU_TYPE_RST			0x02	// RST BPDU (or MST)
-#define BPDU_TYPE_TOPOLOGY_CHANGE	0x80	// STP TCN (Topology change notify) BPDU
+#define BPDU_TYPE_CONF			0x00	/* STP Configuration BPDU */
+#define BPDU_TYPE_RST			0x02	/* RST BPDU (or MST) */
+#define BPDU_TYPE_TOPOLOGY_CHANGE	0x80	/* STP TCN (Topology change notify) BPDU */
 
 static const value_string bpdu_type_vals[] = {
 	{ BPDU_TYPE_CONF,            "Configuration" },
diff --git a/packet-ncp2222.inc b/packet-ncp2222.inc
index a35c6bd66f..e614f6f610 100644
--- a/packet-ncp2222.inc
+++ b/packet-ncp2222.inc
@@ -8,7 +8,7 @@
  * Gilbert Ramirez <gram@alumni.rice.edu>
  * Modified to decode NDS packets by Greg Morris <gmorris@novell.com>
  *
- * $Id: packet-ncp2222.inc,v 1.23 2002/10/08 08:58:55 guy Exp $
+ * $Id: packet-ncp2222.inc,v 1.24 2002/10/08 19:18:57 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -4133,7 +4133,7 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo,
 
                                 info_type = get_info_type((gchar*) ncp_rec->req_info_str->first_string);
                                                             
-                                if (info_type == 2) {    // Is this  a string or not?
+                                if (info_type == 2) {    /* Is this  a string or not? */
                                 
                                         col_append_fstr(pinfo->cinfo, COL_INFO,
       		               	                (gchar*) ncp_rec->req_info_str->first_string,
@@ -4152,7 +4152,7 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo,
 					finfo = g_ptr_array_index(parray, i);
                                         info_type = get_info_type((gchar*) ncp_rec->req_info_str->repeat_string);
                                                                     
-                                        if (info_type == 2) {    // Is this  a string or not?
+                                        if (info_type == 2) {    /* Is this  a string or not? */
                                         
                                                 col_append_fstr(pinfo->cinfo, COL_INFO,
               		               	                (gchar*) ncp_rec->req_info_str->repeat_string,