Make the register routines for the mailslot, pipe, browser, and

mailslot-based logon protocols just be regular register routines,
detected by the script that generates the "register.c" file, rather than
special stuff known to the SMB dissector.

svn path=/trunk/; revision=4222

7 files changed, 12 insertions, 34 deletions

diff --git a/packet-smb-browse.c b/packet-smb-browse.c
index 7720d2cf6a..b4ae94904f 100644
--- a/packet-smb-browse.c
+++ b/packet-smb-browse.c
@@ -2,7 +2,7 @@
  * Routines for SMB Browser packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb-browse.c,v 1.17 2001/08/05 01:15:26 guy Exp $
+ * $Id: packet-smb-browse.c,v 1.18 2001/11/19 10:23:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -848,7 +848,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 }
 
 void
-register_proto_smb_browse(void)
+proto_register_smb_browse(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_command,
diff --git a/packet-smb-logon.c b/packet-smb-logon.c
index 11987fa99a..25d1781bff 100644
--- a/packet-smb-logon.c
+++ b/packet-smb-logon.c
@@ -2,7 +2,7 @@
  * Routines for SMB net logon packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-smb-logon.c,v 1.19 2001/07/13 07:04:23 guy Exp $
+ * $Id: packet-smb-logon.c,v 1.20 2001/11/19 10:23:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -841,11 +841,9 @@ dissect_smb_logon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	return TRUE;
 }
 
-
-
 void
-register_proto_smb_logon( void){
-
+proto_register_smb_logon( void)
+{
 	static hf_register_info hf[] = {
 		{ &hf_command,
 			{ "Command", "netlogon.command", FT_UINT8, BASE_HEX,
diff --git a/packet-smb-mailslot.c b/packet-smb-mailslot.c
index 83558d0f1f..b36ef5ea2f 100644
--- a/packet-smb-mailslot.c
+++ b/packet-smb-mailslot.c
@@ -2,7 +2,7 @@
  * Routines for SMB mailslot packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-smb-mailslot.c,v 1.23 2001/11/19 10:06:41 guy Exp $
+ * $Id: packet-smb-mailslot.c,v 1.24 2001/11/19 10:23:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -188,7 +188,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb,
 }
 
 void
-register_proto_smb_mailslot(void)
+proto_register_smb_mailslot(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_opcode,
diff --git a/packet-smb-mailslot.h b/packet-smb-mailslot.h
index 1216c4b758..520110f84e 100644
--- a/packet-smb-mailslot.h
+++ b/packet-smb-mailslot.h
@@ -2,7 +2,7 @@
  * Declaration of routines for SMB mailslot packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-smb-mailslot.h,v 1.5 2001/11/19 10:06:41 guy Exp $
+ * $Id: packet-smb-mailslot.h,v 1.6 2001/11/19 10:23:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,12 +26,9 @@
 #ifndef _PACKET_SMB_MAILSLOT_H_
 #define _PACKET_SMB_MAILSLOT_H_
 
-extern void register_proto_smb_mailslot(void);
-
 gboolean
 dissect_mailslot_smb(tvbuff_t *total_tvb, tvbuff_t *setup_tvb,
 		     tvbuff_t *tvb, const char *mailslot,
 		     packet_info *pinfo, proto_tree *tree);
 
 #endif
-
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c
index 076543f669..63668b35d9 100644
--- a/packet-smb-pipe.c
+++ b/packet-smb-pipe.c
@@ -8,7 +8,7 @@ XXX  Fixme : shouldnt show [malformed frame] for long packets
  * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
  * Guy Harris 2001
  *
- * $Id: packet-smb-pipe.c,v 1.45 2001/11/19 10:06:41 guy Exp $
+ * $Id: packet-smb-pipe.c,v 1.46 2001/11/19 10:23:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2333,7 +2333,7 @@ dissect_pipe_smb(tvbuff_t *t_tvb, tvbuff_t *s_tvb, tvbuff_t *p_tvb,
 }
 
 void
-register_proto_smb_pipe(void)
+proto_register_smb_pipe(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_function_code,
diff --git a/packet-smb-pipe.h b/packet-smb-pipe.h
index f0101b92cc..ca91eb145d 100644
--- a/packet-smb-pipe.h
+++ b/packet-smb-pipe.h
@@ -2,7 +2,7 @@
  * Declarations of routines for SMB named pipe packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb-pipe.h,v 1.7 2001/11/19 10:06:41 guy Exp $
+ * $Id: packet-smb-pipe.h,v 1.8 2001/11/19 10:23:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,8 +26,6 @@
 #ifndef _PACKET_SMB_PIPE_H_
 #define _PACKET_SMB_PIPE_H_
 
-extern void register_proto_smb_pipe(void);
-
 extern gboolean
 dissect_pipe_smb(tvbuff_t *t_tvb, tvbuff_t *s_tvb, tvbuff_t *p_tvb,
 		 tvbuff_t *d_tvb, const char *pipe, packet_info *pinfo,
diff --git a/packet-smb.c b/packet-smb.c
index 7d142ff99e..a35f3db73b 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -2,7 +2,7 @@
  * Routines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb.c,v 1.158 2001/11/19 10:06:41 guy Exp $
+ * $Id: packet-smb.c,v 1.159 2001/11/19 10:23:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -12923,16 +12923,6 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	return TRUE;
 }
 
-
-
-
-
-
-	/* External routines called during the registration process */
-
-extern void register_proto_smb_browse( void);
-extern void register_proto_smb_logon( void);
-
 void
 proto_register_smb(void)
 {
@@ -14693,11 +14683,6 @@ proto_register_smb(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	proto_register_field_array(proto_smb, hf, array_length(hf));
 	register_init_routine(&smb_init_protocol);
-
-	register_proto_smb_browse();
-	register_proto_smb_logon();
-	register_proto_smb_mailslot();
-	register_proto_smb_pipe();
 }
 
 void