Removed trailing whitespaces from .h and .c files using the

winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116
author: Jörg Mayer <jmayer@loplof.de> 2002-08-28 20:41:00 +0000
committer: Jörg Mayer <jmayer@loplof.de> 2002-08-28 20:41:00 +0000
commit: 48be4e530d6635dbf1ef1dafa984c2060f3caa8a (patch)
tree: fc136de37c7e939ec0c5fc83dbf48297b9650816 /plugins
parent: 64b6acac6dae4c18aa1aebf368923c4bef8ed221 (diff)
download: wireshark-48be4e530d6635dbf1ef1dafa984c2060f3caa8a.tar.gz
wireshark-48be4e530d6635dbf1ef1dafa984c2060f3caa8a.tar.bz2
wireshark-48be4e530d6635dbf1ef1dafa984c2060f3caa8a.zip
15 files changed, 1402 insertions, 1402 deletions
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 9eca311ddc..cc7ce7d963 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -2,7 +2,7 @@
  * Routines for docsis dissection
  * Copyright 2002, Anand V. Narwani <anarwani@cisco.com>
  *
- * $Id: packet-docsis.c,v 1.7 2002/08/20 22:44:25 guy Exp $
+ * $Id: packet-docsis.c,v 1.8 2002/08/28 20:38:59 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,14 +26,14 @@
 
 /* This code is based on the DOCSIS 1.1 specification available at:
  * http://www.cablemodem.com/specifications.html
- * 
- * DOCSIS Captures can be facilitated using the Cable Monitor Feature 
+ *
+ * DOCSIS Captures can be facilitated using the Cable Monitor Feature
  * available on Cisco Cable Modem Termination Systems :
  * http://www.cisco.com/univercd/cc/td/doc/product/cable/cab_rout/cmtsfg/ufg_cmon.htm
  *
  * This dissector depends on the presence of a DOCSIS enapsulation type.
  * There is no simple way to distinguish DOCSIS Frames from Ethernet frames,
- * since the frames are copied from the RF interface on the CMTS to 
+ * since the frames are copied from the RF interface on the CMTS to
  * a Fast Ethernet interface; Thus a preference was needed to enable
  * the DOCSIS encapsulation type.
  */
@@ -252,7 +252,7 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag)
 			       FALSE);
 	  proto_tree_add_item (ehdr_tree, hf_docsis_mini_slots, tvb, pos + 4,
 			       1, FALSE);
-	  if (isfrag) 
+	  if (isfrag)
 	    {
 	      proto_tree_add_item (ehdr_tree, hf_docsis_frag_rsvd, tvb, pos+5,
 	                          1, FALSE);
@@ -303,7 +303,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   tvbuff_t *next_tvb, *mgt_tvb;
   guint16 pdulen, captured_length, framelen;
   gboolean isfrag = FALSE;
-  
+
 /* Set up structures needed to add the protocol subtree and manage it */
   proto_item *ti;
   proto_tree *docsis_tree;
@@ -488,7 +488,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	}
     }
 
-  if ((fctype == FCTYPE_PACKET) && (pdulen == 0)) 
+  if ((fctype == FCTYPE_PACKET) && (pdulen == 0))
     {
       if (concatlen > 0)
         {
@@ -514,7 +514,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	  /* Don't do anything for a Request Frame */
 	  break;
 	case 0x03:
-	  /* For Fragmentation Frames simply dissect using the data 
+	  /* For Fragmentation Frames simply dissect using the data
 	   * dissector as we don't handle them yet
 	   */
 	  mgt_tvb = tvb_new_subset (tvb, hdrlen, captured_length, pdulen);
@@ -526,10 +526,10 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	    }
 	  break;
 	case 0x1c:
-	  /* call the docsis dissector on the same frame 
+	  /* call the docsis dissector on the same frame
 	   * to dissect DOCSIS frames within the concatenated
-	   * frame.  concatpos and concatlen are declared 
-	   * static and are decremented and incremented 
+	   * frame.  concatpos and concatlen are declared
+	   * static and are decremented and incremented
 	   * respectively when the inner
 	   * docsis frames are dissected. */
 	  while (concatlen > 0)
diff --git a/plugins/docsis/packet-docsis.h b/plugins/docsis/packet-docsis.h
index 8cc82a6e1e..cc8f61303c 100644
--- a/plugins/docsis/packet-docsis.h
+++ b/plugins/docsis/packet-docsis.h
@@ -1,21 +1,21 @@
 /* packet-docsis.h
  *
- * $Id: packet-docsis.h,v 1.2 2002/08/02 22:04:13 jmayer Exp $
+ * $Id: packet-docsis.h,v 1.3 2002/08/28 20:38:59 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * 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.
diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c
index d2fb6467a3..0bbacff598 100644
--- a/plugins/docsis/packet-map.c
+++ b/plugins/docsis/packet-map.c
@@ -155,7 +155,7 @@ dissect_map (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	  proto_tree_add_item_hidden(map_tree, hf_docsis_map_sid, tvb, pos, 4, FALSE);
 	  proto_tree_add_item_hidden(map_tree, hf_docsis_map_iuc, tvb, pos, 4, FALSE);
 	  proto_tree_add_item_hidden(map_tree, hf_docsis_map_offset, tvb, pos, 4, FALSE);
-	  if (sid == 0x3FFF) 
+	  if (sid == 0x3FFF)
 	    proto_tree_add_uint_format (map_tree, hf_docsis_map_ie, tvb, pos, 4,
 				      ie, "SID = 0x%x (All CM's), IUC = %s, Offset = %u",
 				      sid, val_to_str (iuc, iuc_vals, "%s"),
diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index 314b8a5de4..5bf4199143 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -42,7 +42,7 @@
 /* This module will dissect the Appendix C TLV's.  Please see:
  * http://www.cablemodem.com/specifications.html
  *
- * The main dissector is dissect_tlv.  This routine will dissect 
+ * The main dissector is dissect_tlv.  This routine will dissect
  * top level TLV's and call sub-dissectors for the sub-TLV's.
  */
 
@@ -1725,17 +1725,17 @@ dissect_svc_unavail(tvbuff_t * tvb, proto_tree * tree, guint16 pos, guint16 leng
 
   proto_item *svc_unavail_it;
   proto_tree *svc_unavail_tree;
-  svc_unavail_it = proto_tree_add_item (tree, 
-                            hf_docsis_tlv_svc_unavail, 
+  svc_unavail_it = proto_tree_add_item (tree,
+                            hf_docsis_tlv_svc_unavail,
 			    tvb, pos, length, FALSE);
   svc_unavail_tree = proto_item_add_subtree(svc_unavail_it, ett_docsis_tlv_svc_unavail );
-  proto_tree_add_item (svc_unavail_tree, 
+  proto_tree_add_item (svc_unavail_tree,
                        hf_docsis_tlv_svc_unavail_classid, tvb,
 	   		pos, 1, FALSE);
-  proto_tree_add_item (svc_unavail_tree, 
+  proto_tree_add_item (svc_unavail_tree,
 	           hf_docsis_tlv_svc_unavail_type, tvb,
 		   pos+1, 1, FALSE);
-  proto_tree_add_item (svc_unavail_tree, 
+  proto_tree_add_item (svc_unavail_tree,
 	           hf_docsis_tlv_svc_unavail_code, tvb,
 		   pos+2, 1, FALSE);
 
@@ -1748,22 +1748,22 @@ dissect_snmpv3_kickstart(tvbuff_t * tvb, proto_tree *tree, guint16 start, guint1
   guint8 type, length;
   guint16 pos = start;
 
-  snmpv3_it = proto_tree_add_item (tree, 
-                            hf_docsis_tlv_snmpv3_kick, 
+  snmpv3_it = proto_tree_add_item (tree,
+                            hf_docsis_tlv_snmpv3_kick,
 			    tvb, start, len, FALSE);
   snmpv3_tree = proto_item_add_subtree(snmpv3_it, ett_docsis_tlv_snmpv3_kick);
-  
+
   while (pos < (start + len)) {
     type = tvb_get_guint8 (tvb, pos++);
     length = tvb_get_guint8 (tvb, pos++);
     switch (type) {
 	case SNMPV3_SEC_NAME:
-  	  proto_tree_add_item (snmpv3_tree, 
+  	  proto_tree_add_item (snmpv3_tree,
 	           hf_docsis_tlv_snmpv3_kick_name, tvb,
 		   pos, length, FALSE);
 	  break;
 	case SNMPV3_MGR_PUB_NUM:
-  	  proto_tree_add_item (snmpv3_tree, 
+  	  proto_tree_add_item (snmpv3_tree,
 	           hf_docsis_tlv_snmpv3_kick_publicnum, tvb,
 		   pos, length, FALSE);
 	  break;
@@ -1800,7 +1800,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
 	    {
 	    case TLV_DOWN_FREQ:
 	      /* This is ugly.  There are multiple type 1 TLV's that may appear
-	       * in the TLV data, the problem is that they are dependent on 
+	       * in the TLV data, the problem is that they are dependent on
 	       * message type.  */
 	      if (length == 4)
 		proto_tree_add_item (tlv_tree, hf_docsis_tlv_down_freq, tvb,
@@ -1877,11 +1877,11 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
 				   length, FALSE);
 	      break;
 	    case TLV_SNMP_WRITE_CTRL:
-	      proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_access, tvb, 
+	      proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_access, tvb,
 			          pos, length, FALSE);
 	      break;
 	    case TLV_SNMP_OBJECT:
-	      proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_obj, tvb, 
+	      proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_obj, tvb,
 			          pos, length, FALSE);
 	      break;
 	    case TLV_MODEM_IP:
@@ -1896,7 +1896,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
 		}
 	      break;
 	    case TLV_SVC_UNAVAIL:
-	      if (length == 3) 
+	      if (length == 3)
 	        {
 	          dissect_svc_unavail(tvb, tlv_tree, pos, length);
 		}
@@ -1980,7 +1980,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
 	      dissect_phs (tvb, tlv_tree, pos, length);
 	      break;
 	    case TLV_HMAC_DIGEST:
-	      if (length == 20) 
+	      if (length == 20)
 	        {
 		  proto_tree_add_item (tlv_tree,
 				      hf_docsis_tlv_hmac_digest, tvb,
@@ -2045,24 +2045,24 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
 		                   tvb, pos, length, FALSE);
 	      break;
 	    case TLV_SUBS_MGMT_CPE:
-	      if ((length % 4) == 0) 
+	      if ((length % 4) == 0)
 	        {
 	        proto_tree_add_item (tlv_tree, hf_docsis_tlv_subs_mgmt_ip_table,
 		                   tvb, pos, length, FALSE);
-	        for (x = 0; x < length; x+=4) 
+	        for (x = 0; x < length; x+=4)
 		  {
-	          proto_tree_add_item (tlv_tree, 
+	          proto_tree_add_item (tlv_tree,
 				       hf_docsis_tlv_subs_mgmt_ip_entry,
 		                       tvb, pos + x, 4, FALSE);
 		  }
-	        } 
+	        }
 	      else
-	        {  
+	        {
 		  THROW (ReportedBoundsError);
 		}
 	      break;
 	    case TLV_SUBS_MGMT_FLTR:
-	      proto_tree_add_item (tlv_tree, 
+	      proto_tree_add_item (tlv_tree,
 			           hf_docsis_tlv_subs_mgmt_filter_grps,
 		                   tvb, pos, length, FALSE);
 	      break;
diff --git a/plugins/docsis/packet-tlv.h b/plugins/docsis/packet-tlv.h
index 5c0dee9432..3e34cb39f0 100644
--- a/plugins/docsis/packet-tlv.h
+++ b/plugins/docsis/packet-tlv.h
@@ -67,7 +67,7 @@
 #define TLV_VENDOR_SPEC 43
 #define TLV_END 255
 
-/* Define DOCSIS 1.0 Class Of Service Configuration Types 
+/* Define DOCSIS 1.0 Class Of Service Configuration Types
  * These are subtypes of TLV_COS (4)
  */
 #define COS_CLASSID 1
@@ -193,7 +193,7 @@
 #define SFW_MAX_DOWN_LAT 14
 
 /* Define Service Flow Error sub-subtypes
- * These are subtypes of 
+ * These are subtypes of
  * SFW_ERRORS ([24/25].5)
  */
 #define SFW_ERR_PARAM 1
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c
index 24786b2257..161f8672dd 100644
--- a/plugins/giop/packet-coseventcomm.c
+++ b/plugins/giop/packet-coseventcomm.c
@@ -11,19 +11,19 @@
  * By Gerald Combs
  * Copyright 1999 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.
@@ -56,19 +56,19 @@ G_MODULE_EXPORT const gchar version[] = "0.0.1";
 
 
 /* Struct prototype declaration Start */
- 
+
 
 
 /* Struct prototype declaration End */
- 
+
 
 
 /* Union prototype declaration Start */
- 
+
 
 
 /* Union prototype declaration End */
- 
+
 
 
 /* Initialise the protocol and subtree pointers */
@@ -94,8 +94,8 @@ static guint32  boundary = GIOP_HEADER_SIZE;  /* initial value */
 /*
  * IDL Operations Start
  */
- 
- 
+
+
 static const char CosEventComm_PushConsumer_push_op[] = "push" ;
 static const char CosEventComm_PushConsumer_disconnect_push_consumer_op[] = "disconnect_push_consumer" ;
 static const char CosEventComm_PushSupplier_disconnect_push_supplier_op[] = "disconnect_push_supplier" ;
@@ -107,40 +107,40 @@ static const char CosEventComm_PullConsumer_disconnect_pull_consumer_op[] = "dis
 /*
  * IDL Operations End
  */
- 
+
 
 /*  Begin Exception (containing members) String  Declare  */
 
 
-    
+
 /*  End Exception (containing members) String Declare  */
 
 
 /*
  * IDL Attributes Start
  */
- 
- 
+
+
 
 /*
  * IDL Attributes End
  */
- 
+
 
 /*
  * IDL Enums Start
  */
- 
- 
+
+
 /*
  * IDL Enums End
  */
- 
- 
+
+
 /*  Begin Exception Helper Functions  */
 
 
-    
+
 /*  End Exception Helper Functions  */
 
 
@@ -149,24 +149,24 @@ static const char CosEventComm_PullConsumer_disconnect_pull_consumer_op[] = "dis
  * Main delegator for exception handling
  *
  */
- 
+
 static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_ ) {
-    
+
     gboolean be _U_;                        /* big endianess */
 
-    
+
 
 
 
     return FALSE;    /* user exception not found */
 
 }
-    
+
 
 /*  Begin Attribute Helper Functions  */
 
 
-    
+
 /*  End Attribute Helper Functions  */
 
 
@@ -174,513 +174,513 @@ static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 /*
  * IDL:omg.org/CosEventComm/PushConsumer/push:1.0
  */
- 
+
 
 static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header);
-        
-        
+
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosEventComm/PushConsumer/disconnect_push_consumer:1.0
  */
- 
+
 
 static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosEventComm/PushSupplier/disconnect_push_supplier:1.0
  */
- 
+
 
 static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosEventComm/PullSupplier/pull:1.0
  */
- 
+
 
 static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
+
             get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header);
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosEventComm/PullSupplier/try_pull:1.0
  */
- 
+
 
 static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint8    u_octet1;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
+
             get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header);
-            
-            
+
+
             u_octet1 = get_CDR_boolean(tvb,offset);
             if (tree) {
                proto_tree_add_text(tree,tvb,*offset-1,1,"has_event = %u",u_octet1);
             }
-            
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosEventComm/PullSupplier/disconnect_pull_supplier:1.0
  */
- 
+
 
 static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosEventComm/PullConsumer/disconnect_pull_consumer:1.0
  */
- 
+
 
 static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname _U_) {
 
     proto_item *ti = NULL;
     proto_tree *tree = NULL;            /* init later, inside if(tree) */
-    
+
     gboolean be;                        /* big endianess */
 
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSEVENTCOMM");
 
-/* 
- * Do not clear COL_INFO, as nothing is being written there by 
+/*
+ * Do not clear COL_INFO, as nothing is being written there by
  * this dissector yet. So leave it as is from the GIOP dissector.
- * TODO: add something useful to COL_INFO 
+ * TODO: add something useful to COL_INFO
  *  if (check_col(pinfo->cinfo, COL_INFO))
  *     col_clear(pinfo->cinfo, COL_INFO);
  */
@@ -688,7 +688,7 @@ static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tr
     if (ptree) {
        ti = proto_tree_add_item(ptree, proto_coseventcomm, tvb, *offset, tvb_length(tvb) - *offset, FALSE);
        tree = proto_item_add_subtree(ti, ett_coseventcomm);
-    }  
+    }
 
 
     be = is_big_endian(header);         /* get endianess - TODO use passed in stream_is_big_endian instead ? */
@@ -701,52 +701,52 @@ static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
     }
 
-    
+
 
     switch(header->message_type) {
-    
+
     case Request:
     case Reply:
-    
-    
+
+
         if (!strcmp(operation, CosEventComm_PushConsumer_push_op )) {
            decode_CosEventComm_PushConsumer_push(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosEventComm_PushConsumer_disconnect_push_consumer_op )) {
            decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosEventComm_PushSupplier_disconnect_push_supplier_op )) {
            decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosEventComm_PullSupplier_pull_op )) {
            decode_CosEventComm_PullSupplier_pull(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosEventComm_PullSupplier_try_pull_op )) {
            decode_CosEventComm_PullSupplier_try_pull(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosEventComm_PullSupplier_disconnect_pull_supplier_op )) {
            decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosEventComm_PullConsumer_disconnect_pull_consumer_op )) {
            decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
-        
+
+
         break;
-        
+
     case CancelRequest:
     case LocateRequest:
     case LocateReply:
@@ -754,13 +754,13 @@ static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tr
     case MessageError:
     case Fragment:
        return FALSE;      /* not handled yet */
-    
+
     default:
        return FALSE;      /* not handled yet */
-    
+
     }   /* switch */
-    
-    
+
+
 
     return FALSE;
 
@@ -779,7 +779,7 @@ void proto_register_giop_coseventcomm(void) {
    static hf_register_info hf[] = {
 
       /* no fields yet */
-      
+
    };
 #endif
 
@@ -790,14 +790,14 @@ void proto_register_giop_coseventcomm(void) {
    };
 
    /* Register the protocol name and description */
-   
+
    proto_coseventcomm = proto_register_protocol("Coseventcomm Dissector Using GIOP API" , "COSEVENTCOMM", "giop-coseventcomm" );
 
 #if 0
    proto_register_field_array(proto_coseventcomm, hf, array_length(hf));
 #endif
    proto_register_subtree_array(ett,array_length(ett));
-   
+
 }
 
 
@@ -808,53 +808,53 @@ void proto_register_giop_coseventcomm(void) {
 void proto_register_handoff_giop_coseventcomm(void) {
 
 
-    
+
     #if 0
-    
+
     /* Register for Explicit Dissection */
-    
+
     register_giop_user_module(dissect_coseventcomm, "COSEVENTCOMM", "CosEventComm/PullConsumer", proto_coseventcomm );     /* explicit dissector */
-    
+
     #endif
-    
-    
-    
+
+
+
     #if 0
-    
+
     /* Register for Explicit Dissection */
-    
+
     register_giop_user_module(dissect_coseventcomm, "COSEVENTCOMM", "CosEventComm/PushSupplier", proto_coseventcomm );     /* explicit dissector */
-    
+
     #endif
-    
-    
-    
+
+
+
     #if 0
-    
+
     /* Register for Explicit Dissection */
-    
+
     register_giop_user_module(dissect_coseventcomm, "COSEVENTCOMM", "CosEventComm/PushConsumer", proto_coseventcomm );     /* explicit dissector */
-    
+
     #endif
-    
-    
-    
+
+
+
     #if 0
-    
+
     /* Register for Explicit Dissection */
-    
+
     register_giop_user_module(dissect_coseventcomm, "COSEVENTCOMM", "CosEventComm/PullSupplier", proto_coseventcomm );     /* explicit dissector */
-    
+
     #endif
-    
-    
-    
-    
+
+
+
+
     /* Register for Heuristic Dissection */
-    
-    register_giop_user(dissect_coseventcomm, "COSEVENTCOMM" ,proto_coseventcomm);     /* heuristic dissector */ 
-    
-    
+
+    register_giop_user(dissect_coseventcomm, "COSEVENTCOMM" ,proto_coseventcomm);     /* heuristic dissector */
+
+
 
 }
 
diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c
index 9e1e22bb4e..1774ac6036 100644
--- a/plugins/giop/packet-cosnaming.c
+++ b/plugins/giop/packet-cosnaming.c
@@ -11,19 +11,19 @@
  * By Gerald Combs
  * Copyright 1999 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.
@@ -56,17 +56,17 @@ G_MODULE_EXPORT const gchar version[] = "0.0.1";
 
 
 /* Struct prototype declaration Start */
- 
 
 
-        
+
+
 /* Struct = IDL:omg.org/CosNaming/NameComponent:1.0 */
 
 static void decode_CosNaming_NameComponent_st(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation);
 
 
 
-        
+
 /* Struct = IDL:omg.org/CosNaming/Binding:1.0 */
 
 static void decode_CosNaming_Binding_st(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation);
@@ -74,15 +74,15 @@ static void decode_CosNaming_Binding_st(tvbuff_t *tvb, packet_info *pinfo, proto
 
 
 /* Struct prototype declaration End */
- 
+
 
 
 /* Union prototype declaration Start */
- 
+
 
 
 /* Union prototype declaration End */
- 
+
 
 
 /* Initialise the protocol and subtree pointers */
@@ -108,8 +108,8 @@ static guint32  boundary = GIOP_HEADER_SIZE;  /* initial value */
 /*
  * IDL Operations Start
  */
- 
- 
+
+
 static const char CosNaming_NamingContext_bind_op[] = "bind" ;
 static const char CosNaming_NamingContext_rebind_op[] = "rebind" ;
 static const char CosNaming_NamingContext_bind_context_op[] = "bind_context" ;
@@ -127,65 +127,65 @@ static const char CosNaming_BindingIterator_destroy_op[] = "destroy" ;
 /*
  * IDL Operations End
  */
- 
+
 
 /*  Begin Exception (containing members) String  Declare  */
 
 
-static const char user_exception_CosNaming_NamingContext_NotFound[] = "IDL:omg.org/CosNaming/NamingContext/NotFound:1.0" ; 
-static const char user_exception_CosNaming_NamingContext_CannotProceed[] = "IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0" ; 
-    
+static const char user_exception_CosNaming_NamingContext_NotFound[] = "IDL:omg.org/CosNaming/NamingContext/NotFound:1.0" ;
+static const char user_exception_CosNaming_NamingContext_CannotProceed[] = "IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0" ;
+
 /*  End Exception (containing members) String Declare  */
 
 
 /*
  * IDL Attributes Start
  */
- 
- 
+
+
 
 /*
  * IDL Attributes End
  */
- 
+
 
 /*
  * IDL Enums Start
  */
- 
- 
+
+
 /*
  * Enum = IDL:omg.org/CosNaming/BindingType:1.0
  */
- 
- 
+
+
 static const value_string CosNaming_BindingType[] = {
 
-   { 0, "nobject" }, 
-   { 1, "ncontext" }, 
+   { 0, "nobject" },
+   { 1, "ncontext" },
    { 0,       NULL },
 };
-    
+
 
 /*
  * Enum = IDL:omg.org/CosNaming/NamingContext/NotFoundReason:1.0
  */
- 
- 
+
+
 static const value_string CosNaming_NamingContext_NotFoundReason[] = {
 
-   { 0, "missing_node" }, 
-   { 1, "not_context" }, 
-   { 2, "not_object" }, 
+   { 0, "missing_node" },
+   { 1, "not_context" },
+   { 2, "not_object" },
    { 0,       NULL },
 };
-    
+
 
 /*
  * IDL Enums End
  */
- 
- 
+
+
 /*  Begin Exception Helper Functions  */
 
 
@@ -196,43 +196,43 @@ static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4;
     guint32   u_octet4_loop_NotFound_rest_of_name;
     guint32   i_NotFound_rest_of_name;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);  /* get stream endianess */
-    
-    
-        
+
+
+
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
        proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,CosNaming_NamingContext_NotFoundReason,"Unknown Enum Value"));
     }
-    
+
     u_octet4_loop_NotFound_rest_of_name = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of NotFound_rest_of_name = %u",u_octet4_loop_NotFound_rest_of_name);   
+       proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of NotFound_rest_of_name = %u",u_octet4_loop_NotFound_rest_of_name);
     }
-    
+
     for (i_NotFound_rest_of_name=0; i_NotFound_rest_of_name < u_octet4_loop_NotFound_rest_of_name; i_NotFound_rest_of_name++) {
-    
+
         /*  Begin struct "CosNaming_NameComponent"  */
-        
-        
-                
+
+
+
         decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-        
-        
+
+
         /*  End struct "CosNaming_NameComponent"  */
-        
+
     }
-    
+
 }
 
 
@@ -242,42 +242,42 @@ static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, p
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_CannotProceed_rest_of_name;
     guint32   i_CannotProceed_rest_of_name;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);  /* get stream endianess */
-    
-    
+
+
     get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-    
-    
+
+
     u_octet4_loop_CannotProceed_rest_of_name = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of CannotProceed_rest_of_name = %u",u_octet4_loop_CannotProceed_rest_of_name);   
+       proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of CannotProceed_rest_of_name = %u",u_octet4_loop_CannotProceed_rest_of_name);
     }
-    
+
     for (i_CannotProceed_rest_of_name=0; i_CannotProceed_rest_of_name < u_octet4_loop_CannotProceed_rest_of_name; i_CannotProceed_rest_of_name++) {
-    
+
         /*  Begin struct "CosNaming_NameComponent"  */
-        
-        
-                
+
+
+
         decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-        
-        
+
+
         /*  End struct "CosNaming_NameComponent"  */
-        
+
     }
-    
+
 }
 
-    
+
 /*  End Exception Helper Functions  */
 
 
@@ -286,36 +286,36 @@ static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, p
  * Main delegator for exception handling
  *
  */
- 
+
 static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_ ) {
-    
+
     gboolean be _U_;                        /* big endianess */
 
-    
+
 
     if (!strcmp(header->exception_id, user_exception_CosNaming_NamingContext_NotFound )) {
        decode_ex_CosNaming_NamingContext_NotFound(tvb, pinfo, tree, offset, header, operation);   /*  IDL:omg.org/CosNaming/NamingContext/NotFound:1.0  */
        return TRUE;
     }
-    
-    
+
+
     if (!strcmp(header->exception_id, user_exception_CosNaming_NamingContext_CannotProceed )) {
        decode_ex_CosNaming_NamingContext_CannotProceed(tvb, pinfo, tree, offset, header, operation);   /*  IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0  */
        return TRUE;
     }
-    
-    
+
+
 
 
     return FALSE;    /* user exception not found */
 
 }
-    
+
 
 /*  Begin Attribute Helper Functions  */
 
 
-    
+
 /*  End Attribute Helper Functions  */
 
 
@@ -323,1127 +323,1127 @@ static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 /*
  * IDL:omg.org/CosNaming/NamingContext/bind:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_n;
     guint32   i_n;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4_loop_n = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);   
+           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);
         }
-        
+
         for (i_n=0; i_n < u_octet4_loop_n; i_n++) {
-        
+
             /*  Begin struct "CosNaming_NameComponent"  */
-            
-            
-                    
+
+
+
             decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-            
-            
+
+
             /*  End struct "CosNaming_NameComponent"  */
-            
+
         }
-        
+
         get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-        
-        
+
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/rebind:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_n;
     guint32   i_n;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4_loop_n = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);   
+           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);
         }
-        
+
         for (i_n=0; i_n < u_octet4_loop_n; i_n++) {
-        
+
             /*  Begin struct "CosNaming_NameComponent"  */
-            
-            
-                    
+
+
+
             decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-            
-            
+
+
             /*  End struct "CosNaming_NameComponent"  */
-            
+
         }
-        
+
         get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-        
-        
+
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/bind_context:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_n;
     guint32   i_n;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4_loop_n = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);   
+           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);
         }
-        
+
         for (i_n=0; i_n < u_octet4_loop_n; i_n++) {
-        
+
             /*  Begin struct "CosNaming_NameComponent"  */
-            
-            
-                    
+
+
+
             decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-            
-            
+
+
             /*  End struct "CosNaming_NameComponent"  */
-            
+
         }
-        
+
         get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-        
-        
+
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/rebind_context:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_n;
     guint32   i_n;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4_loop_n = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);   
+           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);
         }
-        
+
         for (i_n=0; i_n < u_octet4_loop_n; i_n++) {
-        
+
             /*  Begin struct "CosNaming_NameComponent"  */
-            
-            
-                    
+
+
+
             decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-            
-            
+
+
             /*  End struct "CosNaming_NameComponent"  */
-            
+
         }
-        
+
         get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-        
-        
+
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/resolve:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_resolve(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_n;
     guint32   i_n;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4_loop_n = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);   
+           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);
         }
-        
+
         for (i_n=0; i_n < u_octet4_loop_n; i_n++) {
-        
+
             /*  Begin struct "CosNaming_NameComponent"  */
-            
-            
-                    
+
+
+
             decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-            
-            
+
+
             /*  End struct "CosNaming_NameComponent"  */
-            
+
         }
-        
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
+
             get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/unbind:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_n;
     guint32   i_n;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4_loop_n = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);   
+           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);
         }
-        
+
         for (i_n=0; i_n < u_octet4_loop_n; i_n++) {
-        
+
             /*  Begin struct "CosNaming_NameComponent"  */
-            
-            
-                    
+
+
+
             decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-            
-            
+
+
             /*  End struct "CosNaming_NameComponent"  */
-            
+
         }
-        
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/new_context:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_new_context(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
+
             get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/bind_new_context:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_bind_new_context(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_n;
     guint32   i_n;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4_loop_n = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);   
+           proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of n = %u",u_octet4_loop_n);
         }
-        
+
         for (i_n=0; i_n < u_octet4_loop_n; i_n++) {
-        
+
             /*  Begin struct "CosNaming_NameComponent"  */
-            
-            
-                    
+
+
+
             decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-            
-            
+
+
             /*  End struct "CosNaming_NameComponent"  */
-            
+
         }
-        
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
+
             get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/destroy:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_destroy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/NamingContext/list:1.0
  */
- 
+
 
 static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4;
     guint32   u_octet4_loop_bl;
     guint32   i_bl;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4 = get_CDR_ulong(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
            proto_tree_add_text(tree,tvb,*offset-4,4,"how_many = %u",u_octet4);
         }
-        
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             u_octet4_loop_bl = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
             if (tree) {
-               proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of bl = %u",u_octet4_loop_bl);   
+               proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of bl = %u",u_octet4_loop_bl);
             }
-            
+
             for (i_bl=0; i_bl < u_octet4_loop_bl; i_bl++) {
-            
+
                 /*  Begin struct "CosNaming_Binding"  */
-                
-                
-                        
+
+
+
                 decode_CosNaming_Binding_st(tvb, pinfo, tree, offset, header, operation);
-                
-                
+
+
                 /*  End struct "CosNaming_Binding"  */
-                
+
             }
-            
+
             get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/BindingIterator/next_one:1.0
  */
- 
+
 
 static void decode_CosNaming_BindingIterator_next_one(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint8    u_octet1;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
+
             u_octet1 = get_CDR_boolean(tvb,offset);
             if (tree) {
                proto_tree_add_text(tree,tvb,*offset-1,1,"Operation_Return_Value = %u",u_octet1);
             }
-            
+
             /*  Begin struct "CosNaming_Binding"  */
-            
-            
-                    
+
+
+
             decode_CosNaming_Binding_st(tvb, pinfo, tree, offset, header, operation);
-            
-            
+
+
             /*  End struct "CosNaming_Binding"  */
-            
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/BindingIterator/next_n:1.0
  */
- 
+
 
 static void decode_CosNaming_BindingIterator_next_n(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4;
     guint8    u_octet1;
     guint32   u_octet4_loop_bl;
     guint32   i_bl;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         u_octet4 = get_CDR_ulong(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
            proto_tree_add_text(tree,tvb,*offset-4,4,"how_many = %u",u_octet4);
         }
-        
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
+
             u_octet1 = get_CDR_boolean(tvb,offset);
             if (tree) {
                proto_tree_add_text(tree,tvb,*offset-1,1,"Operation_Return_Value = %u",u_octet1);
             }
-            
+
             u_octet4_loop_bl = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
             if (tree) {
-               proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of bl = %u",u_octet4_loop_bl);   
+               proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of bl = %u",u_octet4_loop_bl);
             }
-            
+
             for (i_bl=0; i_bl < u_octet4_loop_bl; i_bl++) {
-            
+
                 /*  Begin struct "CosNaming_Binding"  */
-                
-                
-                        
+
+
+
                 decode_CosNaming_Binding_st(tvb, pinfo, tree, offset, header, operation);
-                
-                
+
+
                 /*  End struct "CosNaming_Binding"  */
-                
+
             }
-            
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
 /*
  * IDL:omg.org/CosNaming/BindingIterator/destroy:1.0
  */
- 
+
 
 static void decode_CosNaming_BindingIterator_destroy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) {
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
-    
+
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);
-    
+
     switch(header->message_type) {
-    
+
     case Request:
-    
+
         break;
-        
+
     case Reply:
-    
+
         switch(header->rep_status) {
-        
+
         case NO_EXCEPTION:
-        
-            
+
+
             /* Function returns void */
-            
-            
+
+
             break;
-            
+
         case USER_EXCEPTION:
-        
+
             break;
-            
+
         default:
-        
+
             /* Unknown Exception */
-        
+
             g_warning("Unknown Exception ");
-        
-            
-        
+
+
+
             break;
-        
-        
+
+
         }   /* switch(header->message_type) */
-        
-        break;   
-        
+
+        break;
+
     default:
-    
+
         /* Unknown GIOP Message */
-    
+
         g_warning("Unknown GIOP Message");
-        
-    
+
+
         break;
-    
-        
-    } /* switch(header->message_type) */ 
-    
+
+
+    } /* switch(header->message_type) */
+
 }
 
 
@@ -1453,40 +1453,40 @@ static void decode_CosNaming_NameComponent_st(tvbuff_t *tvb _U_, packet_info *pi
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4;
     gchar   *seq = NULL;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);  /* get stream endianess */
-    
-    
+
+
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
     if (tree) {
        proto_tree_add_text(tree,tvb,*offset-4-u_octet4,4,"length = %u",u_octet4);
        if (u_octet4 > 0)
           proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"NameComponent_id = %s",seq);
-       
+
     }
-    
+
     g_free(seq);          /*  free buffer  */
     seq = NULL;
-    
+
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
     if (tree) {
        proto_tree_add_text(tree,tvb,*offset-4-u_octet4,4,"length = %u",u_octet4);
        if (u_octet4 > 0)
           proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"NameComponent_kind = %s",seq);
-       
+
     }
-    
+
     g_free(seq);          /*  free buffer  */
     seq = NULL;
-    
+
 }
 
 
@@ -1496,59 +1496,59 @@ static void decode_CosNaming_Binding_st(tvbuff_t *tvb _U_, packet_info *pinfo _U
 
     gboolean stream_is_big_endian;          /* big endianess */
 
-    
+
     /* Operation specific Variable declarations Begin */
-    
+
     guint32   u_octet4_loop_Binding_binding_name;
     guint32   i_Binding_binding_name;
     guint32   u_octet4;
-    
+
     /* Operation specific Variable declarations End */
-    
-    
+
+
     stream_is_big_endian = is_big_endian(header);  /* get stream endianess */
-    
-    
+
+
     u_octet4_loop_Binding_binding_name = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of Binding_binding_name = %u",u_octet4_loop_Binding_binding_name);   
+       proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of Binding_binding_name = %u",u_octet4_loop_Binding_binding_name);
     }
-    
+
     for (i_Binding_binding_name=0; i_Binding_binding_name < u_octet4_loop_Binding_binding_name; i_Binding_binding_name++) {
-    
+
         /*  Begin struct "CosNaming_NameComponent"  */
-        
-        
-                
+
+
+
         decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
-        
-        
+
+
         /*  End struct "CosNaming_NameComponent"  */
-        
+
     }
-    
-        
+
+
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
        proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,CosNaming_BindingType,"Unknown Enum Value"));
     }
-    
+
 }
 
 static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname _U_) {
 
     proto_item *ti = NULL;
     proto_tree *tree = NULL;            /* init later, inside if(tree) */
-    
+
     gboolean be;                        /* big endianess */
 
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSNAMING");
 
-/* 
- * Do not clear COL_INFO, as nothing is being written there by 
+/*
+ * Do not clear COL_INFO, as nothing is being written there by
  * this dissector yet. So leave it as is from the GIOP dissector.
- * TODO: add something useful to COL_INFO 
+ * TODO: add something useful to COL_INFO
  *  if (check_col(pinfo->cinfo, COL_INFO))
  *     col_clear(pinfo->cinfo, COL_INFO);
  */
@@ -1556,7 +1556,7 @@ static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree
     if (ptree) {
        ti = proto_tree_add_item(ptree, proto_cosnaming, tvb, *offset, tvb_length(tvb) - *offset, FALSE);
        tree = proto_item_add_subtree(ti, ett_cosnaming);
-    }  
+    }
 
 
     be = is_big_endian(header);         /* get endianess - TODO use passed in stream_is_big_endian instead ? */
@@ -1569,82 +1569,82 @@ static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
     }
 
-    
+
 
     switch(header->message_type) {
-    
+
     case Request:
     case Reply:
-    
-    
+
+
         if (!strcmp(operation, CosNaming_NamingContext_bind_op )) {
            decode_CosNaming_NamingContext_bind(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_rebind_op )) {
            decode_CosNaming_NamingContext_rebind(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_bind_context_op )) {
            decode_CosNaming_NamingContext_bind_context(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_rebind_context_op )) {
            decode_CosNaming_NamingContext_rebind_context(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_resolve_op )) {
            decode_CosNaming_NamingContext_resolve(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_unbind_op )) {
            decode_CosNaming_NamingContext_unbind(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_new_context_op )) {
            decode_CosNaming_NamingContext_new_context(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_bind_new_context_op )) {
            decode_CosNaming_NamingContext_bind_new_context(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_destroy_op )) {
            decode_CosNaming_NamingContext_destroy(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_NamingContext_list_op )) {
            decode_CosNaming_NamingContext_list(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_BindingIterator_next_one_op )) {
            decode_CosNaming_BindingIterator_next_one(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_BindingIterator_next_n_op )) {
            decode_CosNaming_BindingIterator_next_n(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
+
         if (!strcmp(operation, CosNaming_BindingIterator_destroy_op )) {
            decode_CosNaming_BindingIterator_destroy(tvb, pinfo, tree, offset, header, operation);
            return TRUE;
         }
-        
-        
+
+
         break;
-        
+
     case CancelRequest:
     case LocateRequest:
     case LocateReply:
@@ -1652,13 +1652,13 @@ static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree
     case MessageError:
     case Fragment:
        return FALSE;      /* not handled yet */
-    
+
     default:
        return FALSE;      /* not handled yet */
-    
+
     }   /* switch */
-    
-    
+
+
 
     return FALSE;
 
@@ -1677,7 +1677,7 @@ void proto_register_giop_cosnaming(void) {
    static hf_register_info hf[] = {
 
       /* no fields yet */
-      
+
    };
 #endif
 
@@ -1688,14 +1688,14 @@ void proto_register_giop_cosnaming(void) {
    };
 
    /* Register the protocol name and description */
-   
+
    proto_cosnaming = proto_register_protocol("Cosnaming Dissector Using GIOP API" , "COSNAMING", "giop-cosnaming" );
 
 #if 0
    proto_register_field_array(proto_cosnaming, hf, array_length(hf));
 #endif
    proto_register_subtree_array(ett,array_length(ett));
-   
+
 }
 
 
@@ -1706,33 +1706,33 @@ void proto_register_giop_cosnaming(void) {
 void proto_register_handoff_giop_cosnaming(void) {
 
 
-    
+
     #if 0
-    
+
     /* Register for Explicit Dissection */
-    
+
     register_giop_user_module(dissect_cosnaming, "COSNAMING", "CosNaming/NamingContext", proto_cosnaming );     /* explicit dissector */
-    
+
     #endif
-    
-    
-    
+
+
+
     #if 0
-    
+
     /* Register for Explicit Dissection */
-    
+
     register_giop_user_module(dissect_cosnaming, "COSNAMING", "CosNaming/BindingIterator", proto_cosnaming );     /* explicit dissector */
-    
+
     #endif
-    
-    
-    
-    
+
+
+
+
     /* Register for Heuristic Dissection */
-    
-    register_giop_user(dissect_cosnaming, "COSNAMING" ,proto_cosnaming);     /* heuristic dissector */ 
-    
-    
+
+    register_giop_user(dissect_cosnaming, "COSNAMING" ,proto_cosnaming);     /* heuristic dissector */
+
+
 
 }
 
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 03fae22b9e..1346c652d1 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -3,22 +3,22 @@
  * By Steve Limkemann <stevelim@dgtech.com>
  * Copyright 1998 Steve Limkemann
  *
- * $Id: packet-gryphon.c,v 1.34 2002/08/02 22:04:20 jmayer Exp $
+ * $Id: packet-gryphon.c,v 1.35 2002/08/28 20:39:05 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998
- * 
+ *
  * 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.
@@ -50,7 +50,7 @@ G_MODULE_EXPORT const gchar version[] = VERSION;
 
 #ifndef G_HAVE_GINT64
 #error "Sorry, this won't compile without 64-bit integer support"
-#endif                                                                  
+#endif
 
 /*
  * See
@@ -421,7 +421,7 @@ static const value_string responses[] = {
 	{RESP_NO_SUCH_JOB,	"No such job"},
 	{0,	    	    	NULL},
 	};
-	
+
 static const value_string filter_data_types[] = {
 	{FILTER_DATA_TYPE_HEADER_FRAME, "frame header"},
 	{FILTER_DATA_TYPE_HEADER,   	"data message header"},
@@ -626,7 +626,7 @@ decode_response(tvbuff_t *tvb, int offset, int src, proto_tree *pt)
     proto_tree_add_text (pt, tvb, offset, 4, "Command: %s", cmds[i].strptr);
     offset += 4;
     msglen -= 4;
-    
+
     resp = tvb_get_ntohl (tvb, offset);
     proto_tree_add_text (pt, tvb, offset, 4, "Status: %s",
 	val_to_str(resp, responses, "Unknown (0x%08x)"));
@@ -767,7 +767,7 @@ static int
 cmd_init(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     char    	*ptr;
-    
+
     if (tvb_get_guint8(tvb, offset) == 0)
     	ptr = "Always initialize";
     else
@@ -782,7 +782,7 @@ static int
 eventnum(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     guint8	event = tvb_get_guint8(tvb, offset);
-    
+
     if (event)
     	proto_tree_add_text(pt, tvb, offset, 1, "Event number: %u", event);
     else
@@ -802,7 +802,7 @@ resp_time(tvbuff_t *tvb, int offset, proto_tree *pt)
     } ts;
     unsigned int    timestamp;
     unsigned char   date[45];
-   
+
     ts.lng[1] = tvb_get_ntohl(tvb, offset);
     ts.lng[0] = tvb_get_ntohl(tvb, offset + 4);
     timestamp = ts.lnglng / 100000L;
@@ -825,7 +825,7 @@ cmd_setfilt(tvbuff_t *tvb, int offset, proto_tree *pt)
     int     	    flag = tvb_get_ntohl(tvb, offset);
     int     	    length, padding;
     unsigned char   mode[30];
-    
+
     length =  tvb_get_guint8(tvb, offset+4) + tvb_get_guint8(tvb, offset+5)
 	+ tvb_get_ntohs(tvb, offset+6);
     if (flag)
@@ -936,7 +936,7 @@ resp_filthan(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     int     	handles = tvb_get_guint8(tvb, offset);
     int     	i, padding;
-    
+
     proto_tree_add_text(pt, tvb, offset, 1, "Number of filter handles: %d", handles);
     for (i = 1; i <= handles; i++){
 	proto_tree_add_text(pt, tvb, offset+i, 1, "Handle %d: %u", i,
@@ -953,7 +953,7 @@ static int
 dfiltmode(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     unsigned char   mode;
-    
+
     mode = tvb_get_guint8(tvb, offset);
     proto_tree_add_text(pt, tvb, offset, 1, "Filter mode: %s",
 	val_to_str(mode, dmodes, "Unknown (%u)"));
@@ -966,7 +966,7 @@ static int
 filtmode(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     unsigned char   mode;
-    
+
     mode = tvb_get_guint8(tvb, offset);
     proto_tree_add_text(pt, tvb, offset, 1, "Filter mode: %s",
 	val_to_str(mode, dmodes, "Unknown (%u)"));
@@ -982,7 +982,7 @@ resp_events(tvbuff_t *tvb, int offset, proto_tree *pt)
     unsigned int    i;
     proto_tree	    *tree;
     proto_item	    *item;
-    
+
     msglen = tvb_reported_length_remaining(tvb, offset);
     i = 1;
     while (msglen != 0) {
@@ -1030,7 +1030,7 @@ resp_getspeeds(tvbuff_t *tvb, int offset, proto_tree *pt)
     int size;
     int number;
     int index;
-    
+
     proto_tree_add_text(pt, tvb, offset, 4, "Set Speed IOCTL");
     proto_tree_add_text(pt, tvb, offset+4, 4, "Get Speed IOCTL");
     size = tvb_get_guint8(tvb, offset+8);
@@ -1050,7 +1050,7 @@ static int
 cmd_sort(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     char    	*which;
-    
+
     which = tvb_get_guint8(tvb, offset) ?
 	    "Sort into blocks of up to 16 messages" :
 	    "Do not sort messages";
@@ -1063,8 +1063,8 @@ static int
 cmd_optimize(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     char    	*which;
-    
-    which = tvb_get_guint8(tvb, offset) ? 
+
+    which = tvb_get_guint8(tvb, offset) ?
 	    "Optimize for latency (Nagle algorithm disabled)" :
 	    "Optimize for throughput (Nagle algorithm enabled)";
     proto_tree_add_text(pt, tvb, offset, 1, "Set optimization: %s", which);
@@ -1080,7 +1080,7 @@ resp_config(tvbuff_t *tvb, int offset, proto_tree *pt)
     int     	devices;
     int     	i;
     unsigned int x;
-    
+
     static const value_string protocol_types[] = {
 	{GDUMMY * 256 + GDGDMARKONE,	"Dummy device driver"},
 	{GCAN * 256 + G82527,	    	"CAN, 82527 subtype"},
@@ -1153,7 +1153,7 @@ cmd_sched(tvbuff_t *tvb, int offset, proto_tree *pt)
     int		    save_offset;
     unsigned int    i, x, length;
     unsigned char   def_chan = tvb_get_guint8(tvb, offset-9);
-    
+
     msglen = tvb_reported_length_remaining(tvb, offset);
     x = tvb_get_ntohl(tvb, offset);
     if (x == 0xFFFFFFFF)
@@ -1406,7 +1406,7 @@ resp_resphan(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     int     	handles = tvb_get_guint8(tvb, offset);
     int     	i, padding;
-    
+
     proto_tree_add_text(pt, tvb, offset, 1, "Number of response handles: %d", handles);
     for (i = 1; i <= handles; i++){
 	proto_tree_add_text(pt, tvb, offset+i, 1, "Handle %d: %u", i,
@@ -1450,7 +1450,7 @@ resp_desc(tvbuff_t *tvb, int offset, proto_tree *pt)
     proto_item	*item;
     proto_tree	*tree;
     guint8	flags;
-    
+
     flags = tvb_get_guint8(tvb, offset);
     item = proto_tree_add_text(pt, tvb, offset, 1, "Flags: 0x%02x", flags);
     tree = proto_item_add_subtree (item, ett_gryphon_flags);
@@ -1470,7 +1470,7 @@ cmd_upload(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     int		    msglen;
     unsigned int    length;
-    
+
     msglen = tvb_reported_length_remaining(tvb, offset);
     proto_tree_add_text(pt, tvb, offset, 2, "Block number: %u",
 	tvb_get_ntohs(tvb, offset));
@@ -1516,7 +1516,7 @@ resp_list(tvbuff_t *tvb, int offset, proto_tree *pt)
     proto_item	*item;
     proto_tree	*tree;
     unsigned int    i, count;
-    
+
     count = tvb_get_guint8(tvb, offset);
     proto_tree_add_text(pt, tvb, offset, 1, "Number of programs in this response: %u", count);
     proto_tree_add_text(pt, tvb, offset+1, 1, "reserved");
@@ -1542,7 +1542,7 @@ cmd_start(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     char	    string[120];
     gint	    length;
-    
+
     offset = cmd_delete(tvb, offset, pt);
     length = tvb_get_nstringz0(tvb, offset, 120, string) + 1;
     proto_tree_add_text(pt, tvb, offset, length, "Arguments: %s", string);
@@ -1571,7 +1571,7 @@ resp_status(tvbuff_t *tvb, int offset, proto_tree *pt)
     proto_item	*item;
     proto_tree	*tree;
     unsigned int    i, copies, length;
-    
+
     copies = tvb_get_guint8(tvb, offset);
     item = proto_tree_add_text(pt, tvb, offset, 1, "Number of running copies: %u", copies);
     tree = proto_item_add_subtree (item, ett_gryphon_pgm_status);
@@ -1599,7 +1599,7 @@ cmd_options(tvbuff_t *tvb, int offset, proto_tree *pt)
     proto_tree	    *tree;
     unsigned int    i, size, padding, option, option_length, option_value;
     unsigned char   *string, *string1;
-    
+
     msglen = tvb_reported_length_remaining(tvb, offset);
     item = proto_tree_add_text(pt, tvb, offset, 1, "Handle: %u",
 	tvb_get_guint8(tvb, offset));
@@ -1667,13 +1667,13 @@ cmd_files(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     int	    msglen;
     guchar  *which;
-    
+
     msglen = tvb_reported_length_remaining(tvb, offset);
     if (tvb_get_guint8(tvb, offset) == 0)
 	which = "First group of names";
     else
 	which = "Subsequent group of names";
-    
+
     proto_tree_add_text(pt, tvb, offset, 1, "%s", which);
     proto_tree_add_text(pt, tvb, offset+1, msglen-1, "Directory: %.*s",
 	msglen-1, tvb_get_ptr(tvb, offset+1, msglen-1));
@@ -1686,7 +1686,7 @@ resp_files(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     int		msglen;
     guchar  	*flag;
-    
+
     msglen = tvb_reported_length_remaining(tvb, offset);
     flag = tvb_get_guint8(tvb, offset) ? "Yes": "No";
     proto_tree_add_text(pt, tvb, offset, 1, "More filenames to return: %s", flag);
@@ -1700,19 +1700,19 @@ cmd_usdt(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     guchar  *desc;
     guint8  assemble_flag;
-    
+
     if (tvb_get_guint8(tvb, offset))
 	desc = "Register with gusdt";
     else
 	desc = "Unregister with gusdt";
     proto_tree_add_text(pt, tvb, offset, 1, "%s", desc);
-    
+
     if (tvb_get_guint8(tvb, offset+1))
 	desc = "Echo long transmit messages back to the client";
     else
 	desc = "Do not echo long transmit messages back to the client";
     proto_tree_add_text(pt, tvb, offset+1, 1, "%s", desc);
-    
+
     assemble_flag = tvb_get_guint8(tvb, offset+2);
     if (assemble_flag == 2)
     	desc = "Assemble long received messages but do not send them to the client";
@@ -1721,7 +1721,7 @@ cmd_usdt(tvbuff_t *tvb, int offset, proto_tree *pt)
     else
     	desc = "Do not assemble long received messages on behalf of the client";
     proto_tree_add_text(pt, tvb, offset+2, 1, "%s", desc);
-    
+
     offset += 4;
     return offset;
 }
@@ -1741,7 +1741,7 @@ filter_block(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     unsigned int    type, operator;
     int     length, padding;
-    
+
     proto_tree_add_text(pt, tvb, offset, 2, "Filter field starts at byte %u",
 	tvb_get_ntohs(tvb, offset));
     length = tvb_get_ntohs(tvb, offset+2);
@@ -1755,7 +1755,7 @@ filter_block(tvbuff_t *tvb, int offset, proto_tree *pt)
 	val_to_str(operator, operators, "Unknown (%u)"));
     proto_tree_add_text(pt, tvb, offset+6, 2, "reserved");
     offset += 8;
-    
+
     if (operator == BIT_FIELD_CHECK) {
 	proto_tree_add_text(pt, tvb, offset, length, "Pattern");
 	proto_tree_add_text(pt, tvb, offset+length, length, "Mask");
@@ -1791,7 +1791,7 @@ blm_mode(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     char    *mode, line[50];
     int     x, y, seconds;
-    
+
     x = tvb_get_ntohl(tvb, offset);
     y = tvb_get_ntohl(tvb, offset+4);
     switch (x) {
diff --git a/plugins/gryphon/packet-gryphon.h b/plugins/gryphon/packet-gryphon.h
index f6d947da93..a522f4142b 100644
--- a/plugins/gryphon/packet-gryphon.h
+++ b/plugins/gryphon/packet-gryphon.h
@@ -1,22 +1,22 @@
 /* packet-gryphon.c
  * Definitions for Gryphon packet disassembly structures and routines
  *
- * $Id: packet-gryphon.h,v 1.6 2002/05/01 06:56:16 guy Exp $
+ * $Id: packet-gryphon.h,v 1.7 2002/08/28 20:39:05 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Steve Limkemann <stevelim@dgtech.com>
  * Copyright 1998 Steve Limkemann
- * 
+ *
  * 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.
@@ -294,18 +294,18 @@
 #define GHONSLEEP	0x11600001
 #define GHONSILENCE	0x11600002
 
-#define GKWPSETPTIMES	0x11700011	
-#define GKWPSETWTIMES	0x11700010	
-#define GKWPDOWAKEUP	0x11700008	
-#define GKWPGETBITTIME	0x11700101	
-#define GKWPSETBITTIME	0x11700102	
-#define GKWPSETNODEADDR	0x11700104	
-#define GKWPGETNODETYPE	0x11700105	
-#define GKWPSETNODETYPE	0x11700106	
-#define GKWPSETWAKETYPE	0x11700108	
-#define GKWPSETTARGADDR	0x1170010a	
-#define GKWPSETKEYBYTES	0x1170010c	
-#define GKWPSETSTARTREQ	0x1170010e	
+#define GKWPSETPTIMES	0x11700011
+#define GKWPSETWTIMES	0x11700010
+#define GKWPDOWAKEUP	0x11700008
+#define GKWPGETBITTIME	0x11700101
+#define GKWPSETBITTIME	0x11700102
+#define GKWPSETNODEADDR	0x11700104
+#define GKWPGETNODETYPE	0x11700105
+#define GKWPSETNODETYPE	0x11700106
+#define GKWPSETWAKETYPE	0x11700108
+#define GKWPSETTARGADDR	0x1170010a
+#define GKWPSETKEYBYTES	0x1170010c
+#define GKWPSETSTARTREQ	0x1170010e
 #define GKWPSETSTARTRESP	0x11700110
 #define GKWPSETPROTOCOL		0x11700112
 #define GKWPGETLASTKEYBYTES	0x11700201
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index 8bc9d04437..c5cf133652 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -2,8 +2,8 @@
  * Routines for mgcp packet disassembly
  * RFC 2705
  *
- * $Id: packet-mgcp.c,v 1.34 2002/08/02 22:04:22 jmayer Exp $
- * 
+ * $Id: packet-mgcp.c,v 1.35 2002/08/28 20:39:07 jmayer Exp $
+ *
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
  * Ethereal - Network traffic analyzer
@@ -98,7 +98,7 @@ static int hf_mgcp_param_extention = -1;
 static int hf_mgcp_param_invalid = -1;
 static int hf_mgcp_messagecount = -1;
 
-/* 
+/*
  * Define the trees for mgcp
  * We need one for MGCP itself and one for the MGCP paramters
  */
@@ -106,14 +106,14 @@ static int ett_mgcp = -1;
 static int ett_mgcp_param = -1;
 
 
-/* 
- * Here are the global variables associated with  
+/*
+ * Here are the global variables associated with
  * the various user definable characteristics of the dissection
  *
  * MGCP has two kinds of "agents", gateways and callagents.  Callagents
  * control gateways in a master/slave sort of arrangement.  Since gateways
- * and callagents have different well known ports and could both 
- * operate under either udp or tcp we have rather a lot of port info to 
+ * and callagents have different well known ports and could both
+ * operate under either udp or tcp we have rather a lot of port info to
  * specify.
  *
  * global_mgcp_raw_text determines whether we are going to display
@@ -132,8 +132,8 @@ static gboolean global_mgcp_dissect_tree = TRUE;
 static gboolean global_mgcp_message_count = FALSE;
 
 /*
- * Variables to allow for proper deletion of dissector registration when 
- * the user changes port from the gui. 
+ * Variables to allow for proper deletion of dissector registration when
+ * the user changes port from the gui.
  */
 static int gateway_tcp_port = 0;
 static int gateway_udp_port = 0;
@@ -149,33 +149,33 @@ typedef enum _mgcp_type {
 } mgcp_type_t;
 
 /* Some basic utility functions that are specific to this dissector */
-static gboolean is_mgcp_verb(tvbuff_t *tvb, gint offset, gint maxlength);  
+static gboolean is_mgcp_verb(tvbuff_t *tvb, gint offset, gint maxlength);
 static gboolean is_mgcp_rspcode(tvbuff_t *tvb, gint offset, gint maxlength);
-static gint tvb_parse_param(tvbuff_t *tvb, gint offset, gint maxlength, 
+static gint tvb_parse_param(tvbuff_t *tvb, gint offset, gint maxlength,
 			    int** hf);
 
-/* 
- * The various functions that either dissect some 
- * subpart of MGCP.  These aren't really proto dissectors but they 
+/*
+ * The various functions that either dissect some
+ * subpart of MGCP.  These aren't really proto dissectors but they
  * are written in the same style.
- */ 
-static void dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, 
+ */
+static void dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo,
 				 proto_tree *tree,proto_tree *mgcp_tree, proto_tree *ti);
-static void dissect_mgcp_firstline(tvbuff_t *tvb, 
+static void dissect_mgcp_firstline(tvbuff_t *tvb,
 				   proto_tree *tree);
-static void dissect_mgcp_params(tvbuff_t *tvb,  
+static void dissect_mgcp_params(tvbuff_t *tvb,
 				proto_tree *tree);
 static void mgcp_raw_text_add(tvbuff_t *tvb,
 			      proto_tree *tree);
 
-/* 
- * Some functions which should be moved to a library 
- * as I think that people may find them of general usefulness. 
+/*
+ * Some functions which should be moved to a library
+ * as I think that people may find them of general usefulness.
  */
 static gint tvb_skip_wsp(tvbuff_t* tvb, gint offset, gint maxlength);
 static gint tvb_find_null_line(tvbuff_t* tvb, gint offset, gint len,
-			       gint* next_offset); 
-static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset, 
+			       gint* next_offset);
+static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset,
 			      gint len, gint* next_offset);
 static gboolean is_rfc2234_alpha(guint8 c);
 
@@ -202,7 +202,7 @@ dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   num_messages = 0;
   mgcp_tree = NULL;
   ti = NULL;
-  
+
   /*
    * Set the columns now, so that they'll be set correctly if we throw
    * an exception.  We can set them later as well....
@@ -212,17 +212,17 @@ dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
 
-  /* 
-   * Check to see whether we're really dealing with MGCP by looking 
+  /*
+   * Check to see whether we're really dealing with MGCP by looking
    * for a valid MGCP verb or response code.  This isn't infallible,
    * but its cheap and its better than nothing.
    */
   if(is_mgcp_verb(tvb,0,tvb_len) || is_mgcp_rspcode(tvb,0,tvb_len)){
 
     /* Build the info tree if we've been given a root */
-    if (tree || global_mgcp_message_count == TRUE) {   
-      /* 
-       * Loop through however many mgcp messages may be stuck in 
+    if (tree || global_mgcp_message_count == TRUE) {
+      /*
+       * Loop through however many mgcp messages may be stuck in
        * this packet using piggybacking
        */
       do{
@@ -236,7 +236,7 @@ dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	sectionlen = tvb_find_dot_line(tvb, tvb_sectionbegin, -1,
 				       &tvb_sectionend);
 	if( sectionlen != -1){
-	  dissect_mgcp_message(tvb_new_subset(tvb, tvb_sectionbegin, 
+	  dissect_mgcp_message(tvb_new_subset(tvb, tvb_sectionbegin,
 					      sectionlen, -1),
 			       pinfo, tree, mgcp_tree,ti);
 	  tvb_sectionbegin = tvb_sectionend;
@@ -246,13 +246,13 @@ dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
       } while(tvb_sectionend < tvb_len );
       if(mgcp_tree){
-	proto_tree_add_uint_hidden(mgcp_tree, hf_mgcp_messagecount, tvb, 
-				   0 ,0 , num_messages); 
+	proto_tree_add_uint_hidden(mgcp_tree, hf_mgcp_messagecount, tvb,
+				   0 ,0 , num_messages);
       }
-    } 
+    }
 
-    /* 
-     * Add our column information we do this after dissecting SDP 
+    /*
+     * Add our column information we do this after dissecting SDP
      * in order to prevent the column info changing to reflect the SDP.
      */
     tvb_sectionbegin = 0;
@@ -269,18 +269,18 @@ dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	  col_add_str(pinfo->cinfo, COL_PROTOCOL, "MGCP");
       }
     }
-	
+
     if (check_col(pinfo->cinfo, COL_INFO) ){
       sectionlen = tvb_find_line_end(tvb, tvb_sectionbegin,-1,
 				     &tvb_sectionend,FALSE);
-      col_add_fstr(pinfo->cinfo, COL_INFO, "%s", 
+      col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
 		   tvb_format_text(tvb,tvb_sectionbegin,sectionlen));
-    } 
-  }  
+    }
+  }
 }
 
-static void 
-dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 
+static void
+dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		     proto_tree *mgcp_tree, proto_tree *ti){
 
   /* Declare variables */
@@ -295,16 +295,16 @@ dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   tvb_len = tvb_length(tvb);
   tvb_current_len  = tvb_len;
 
-  /* 
-   * Check to see whether we're really dealing with MGCP by looking 
+  /*
+   * Check to see whether we're really dealing with MGCP by looking
    * for a valid MGCP verb or response code.  This isn't infallible,
    * but its cheap and its better than nothing.
    */
   if(is_mgcp_verb(tvb,0,tvb_len) || is_mgcp_rspcode(tvb,0,tvb_len)){
-    
+
     /* Build the info tree if we've been given a root */
-    if (tree && mgcp_tree) {  
-      
+    if (tree && mgcp_tree) {
+
       /* dissect first line */
       tvb_sectionbegin = 0;
       tvb_current_len = tvb_len;
@@ -312,7 +312,7 @@ dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       sectionlen = tvb_find_line_end(tvb,0,-1,&tvb_sectionend,FALSE);
       if( sectionlen > 0){
 	dissect_mgcp_firstline(tvb_new_subset(tvb, tvb_sectionbegin,
-					      sectionlen,-1), 
+					      sectionlen,-1),
 			       mgcp_tree);
       }
       tvb_sectionbegin = tvb_sectionend;
@@ -321,13 +321,13 @@ dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       if(tvb_sectionbegin < tvb_len){
 	sectionlen = tvb_find_null_line(tvb, tvb_sectionbegin, -1,
 					&tvb_sectionend);
-	dissect_mgcp_params(tvb_new_subset(tvb, tvb_sectionbegin, 
+	dissect_mgcp_params(tvb_new_subset(tvb, tvb_sectionbegin,
 					   sectionlen, -1),
 			    mgcp_tree);
 	tvb_sectionbegin = tvb_sectionend;
       }
-	
-      /* set the mgcp payload length correctly so we don't include the 
+
+      /* set the mgcp payload length correctly so we don't include the
        * encapsulated SDP
        */
       sectionlen = tvb_sectionend;
@@ -342,8 +342,8 @@ dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       }
 
       /* dissect sdp payload */
-      if( tvb_sectionend < tvb_len && global_mgcp_dissect_tree == TRUE){ 
-	next_tvb = tvb_new_subset(tvb, tvb_sectionend, -1, -1);       
+      if( tvb_sectionend < tvb_len && global_mgcp_dissect_tree == TRUE){
+	next_tvb = tvb_new_subset(tvb, tvb_sectionend, -1, -1);
 	call_dissector(sdp_handle, next_tvb, pinfo, tree);
       }
     }
@@ -351,8 +351,8 @@ dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 }
 
 
-/* 
- * Add the raw text of the message to the dissect tree if appropriate 
+/*
+ * Add the raw text of the message to the dissect tree if appropriate
  * preferences are specified.
  */
 
@@ -366,8 +366,8 @@ static void mgcp_raw_text_add(tvbuff_t *tvb, proto_tree *tree){
   do {
     tvb_find_line_end(tvb,tvb_linebegin,-1,&tvb_lineend,FALSE);
     linelen = tvb_lineend - tvb_linebegin;
-    proto_tree_add_text(tree, tvb, tvb_linebegin, linelen, 
-			"%s", tvb_format_text(tvb,tvb_linebegin, 
+    proto_tree_add_text(tree, tvb, tvb_linebegin, linelen,
+			"%s", tvb_format_text(tvb,tvb_linebegin,
 					      linelen));
     tvb_linebegin = tvb_lineend;
   } while ( tvb_lineend < tvb_len );
@@ -375,18 +375,18 @@ static void mgcp_raw_text_add(tvbuff_t *tvb, proto_tree *tree){
 
 /* Register all the bits needed with the filtering engine */
 
-void 
+void
 proto_register_mgcp(void)
 {
   static hf_register_info hf[] = {
     { &hf_mgcp_req,
-      { "Request", "mgcp.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, 
+      { "Request", "mgcp.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 	"True if MGCP request", HFILL }},
     { &hf_mgcp_rsp,
-      { "Response", "mgcp.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, 
+      { "Response", "mgcp.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 	"TRUE if MGCP response", HFILL }},
     { &hf_mgcp_req_verb,
-      { "Verb", "mgcp.req.verb", FT_STRING, BASE_DEC, NULL, 0x0, 
+      { "Verb", "mgcp.req.verb", FT_STRING, BASE_DEC, NULL, 0x0,
 	"Name of the verb", HFILL }},
     { &hf_mgcp_req_endpoint,
       { "Endpoint", "mgcp.req.endpoint", FT_STRING, BASE_DEC, NULL, 0x0,
@@ -394,29 +394,29 @@ proto_register_mgcp(void)
     { &hf_mgcp_transid,
       { "Transaction ID", "mgcp.transid", FT_STRING, BASE_DEC, NULL, 0x0,
 	"Transaction ID of this message", HFILL }},
-    { &hf_mgcp_version, 
+    { &hf_mgcp_version,
       { "Version", "mgcp.version", FT_STRING, BASE_DEC, NULL, 0x0,
 	"MGCP Version", HFILL }},
-    { &hf_mgcp_rsp_rspcode, 
+    { &hf_mgcp_rsp_rspcode,
       { "Response Code", "mgcp.rsp.rspcode", FT_STRING, BASE_DEC, NULL, 0x0,
 	"Response Code", HFILL }},
     { &hf_mgcp_rsp_rspstring,
-      { "Response String", "mgcp.rsp.rspstring", FT_STRING, BASE_DEC, NULL, 
+      { "Response String", "mgcp.rsp.rspstring", FT_STRING, BASE_DEC, NULL,
 	0x0, "Response String", HFILL }},
     { &hf_mgcp_param_rspack,
       { "ResponseAck (K)", "mgcp.param.rspack", FT_STRING, BASE_DEC, NULL,
 	0x0, "Response Ack", HFILL }},
     { &hf_mgcp_param_bearerinfo,
-      { "BearerInformation (B)", "mgcp.param.bearerinfo", FT_STRING, BASE_DEC, 
+      { "BearerInformation (B)", "mgcp.param.bearerinfo", FT_STRING, BASE_DEC,
 	NULL, 0x0, "Bearer Information", HFILL }},
     { &hf_mgcp_param_callid,
       { "CallId (C)", "mgcp.param.callid", FT_STRING, BASE_DEC, NULL, 0x0,
 	"Call Id", HFILL }},
     { &hf_mgcp_param_connectionid,
-      {"ConnectionIdentifier (I)", "mgcp.param.connectionid", FT_STRING, 
+      {"ConnectionIdentifier (I)", "mgcp.param.connectionid", FT_STRING,
        BASE_DEC, NULL, 0x0, "Connection Identifier", HFILL }},
     { &hf_mgcp_param_secondconnectionid,
-      { "SecondConnectionID (I2)", "mgcp.param.secondconnectionid", FT_STRING, 
+      { "SecondConnectionID (I2)", "mgcp.param.secondconnectionid", FT_STRING,
        BASE_DEC, NULL, 0x0, "Second Connection Identifier", HFILL }},
     { &hf_mgcp_param_notifiedentity,
       { "NotifiedEntity (N)", "mgcp.param.notifiedentity", FT_STRING, BASE_DEC,
@@ -425,7 +425,7 @@ proto_register_mgcp(void)
       { "RequestIdentifier (X)", "mgcp.param.requestid", FT_STRING, BASE_DEC,
 	NULL, 0x0, "Request Identifier", HFILL }},
     { &hf_mgcp_param_localconnoptions,
-      { "LocalConnectionOptions (L)", "mgcp.param.localconnectionoptions", 
+      { "LocalConnectionOptions (L)", "mgcp.param.localconnectionoptions",
 	FT_STRING, BASE_DEC, NULL, 0x0, "Local Connection Options", HFILL }},
     { &hf_mgcp_param_connectionmode,
       { "ConnectionMode (M)", "mgcp.param.connectionmode", FT_STRING, BASE_DEC,
@@ -436,20 +436,20 @@ proto_register_mgcp(void)
     { &hf_mgcp_param_signalreq,
       { "SignalRequests (S)", "mgcp.param.signalreq", FT_STRING, BASE_DEC,
 	NULL, 0x0, "Signal Request", HFILL }},
-    { &hf_mgcp_param_restartmethod, 
+    { &hf_mgcp_param_restartmethod,
       { "RestartMethod (RM)", "mgcp.param.restartmethod", FT_STRING, BASE_DEC,
 	NULL, 0x0, "Restart Method", HFILL }},
     { &hf_mgcp_param_restartdelay,
       { "RestartDelay (RD)", "mgcp.param.restartdelay", FT_STRING, BASE_DEC,
 	NULL, 0x0, "Restart Delay", HFILL }},
-    { &hf_mgcp_param_digitmap, 
+    { &hf_mgcp_param_digitmap,
       { "DigitMap (D)", "mgcp.param.digitmap", FT_STRING, BASE_DEC, NULL, 0x0,
 	"Digit Map", HFILL }},
-    { &hf_mgcp_param_observedevent, 
-      { "ObservedEvents (O)", "mgcp.param.observedevents", FT_STRING, 
+    { &hf_mgcp_param_observedevent,
+      { "ObservedEvents (O)", "mgcp.param.observedevents", FT_STRING,
 	BASE_DEC, NULL, 0x0, "Observed Events", HFILL }},
     { &hf_mgcp_param_connectionparam,
-      { "ConnectionParameters (P)", "mgcp.param.connectionparam", FT_STRING, 
+      { "ConnectionParameters (P)", "mgcp.param.connectionparam", FT_STRING,
 	BASE_DEC, NULL, 0x0, "Connection Parameters", HFILL }},
     { &hf_mgcp_param_reasoncode,
       { "ReasonCode (E)", "mgcp.param.reasoncode", FT_STRING, BASE_DEC,
@@ -464,9 +464,9 @@ proto_register_mgcp(void)
       { "SecondEndpointID (Z2)", "mgcp.param.secondendpointid", FT_STRING,
 	BASE_DEC, NULL, 0x0, "Second Endpoing ID", HFILL }},
     { &hf_mgcp_param_reqinfo,
-      { "RequestedInfo (F)", "mgcp.param.reqinfo", FT_STRING, BASE_DEC, 
+      { "RequestedInfo (F)", "mgcp.param.reqinfo", FT_STRING, BASE_DEC,
 	NULL, 0x0,"Requested Info", HFILL }},
-    { &hf_mgcp_param_quarantinehandling, 
+    { &hf_mgcp_param_quarantinehandling,
       { "QuarantineHandling (Q)", "mgcp.param.quarantinehandling", FT_STRING,
 	BASE_DEC, NULL, 0x0, "Quarantine Handling", HFILL }},
     { &hf_mgcp_param_detectedevents,
@@ -476,13 +476,13 @@ proto_register_mgcp(void)
       { "Capabilities (A)", "mgcp.param.capabilities", FT_STRING, BASE_DEC,
 	NULL, 0x0, "Capabilities", HFILL }},
     { &hf_mgcp_param_extention,
-      { "Extention Parameter (X-*)", "mgcp.param.extention", FT_STRING, 
+      { "Extention Parameter (X-*)", "mgcp.param.extention", FT_STRING,
 	BASE_DEC, NULL, 0x0, "Extension Parameter", HFILL }},
     { &hf_mgcp_param_invalid,
-      { "Invalid Parameter", "mgcp.param.invalid", FT_STRING, 
+      { "Invalid Parameter", "mgcp.param.invalid", FT_STRING,
 	BASE_DEC, NULL, 0x0, "Invalid Parameter", HFILL }},
-    { &hf_mgcp_messagecount, 
-      { "MGCP Message Count", "mgcp.messagecount", FT_UINT32, 
+    { &hf_mgcp_messagecount,
+      { "MGCP Message Count", "mgcp.messagecount", FT_UINT32,
 	BASE_DEC, NULL, 0x0, "Number of MGCP message in a packet", HFILL }},
     /* Add more fields here */
   };
@@ -490,7 +490,7 @@ proto_register_mgcp(void)
     &ett_mgcp,
     &ett_mgcp_param,
   };
-  module_t *mgcp_module; 
+  module_t *mgcp_module;
 
   proto_mgcp = proto_register_protocol("Media Gateway Control Protocol",
 				       "MGCP", "mgcp");
@@ -502,49 +502,49 @@ proto_register_mgcp(void)
 
   mgcp_module = prefs_register_protocol(proto_mgcp, proto_reg_handoff_mgcp);
 
-  prefs_register_uint_preference(mgcp_module, "tcp.gateway_port", 
+  prefs_register_uint_preference(mgcp_module, "tcp.gateway_port",
 				 "MGCP Gateway TCP Port",
 				 "Set the UDP port for gateway messages "
 				 "(if other than the default of 2427)",
 				 10, &global_mgcp_gateway_tcp_port);
 
-  prefs_register_uint_preference(mgcp_module, "udp.gateway_port", 
+  prefs_register_uint_preference(mgcp_module, "udp.gateway_port",
 				 "MGCP Gateway UDP Port",
 				 "Set the TCP port for gateway messages "
 				 "(if other than the default of 2427)",
 				 10, &global_mgcp_gateway_udp_port);
 
-  prefs_register_uint_preference(mgcp_module, "tcp.callagent_port", 
+  prefs_register_uint_preference(mgcp_module, "tcp.callagent_port",
 				 "MGCP Callagent TCP Port",
 				 "Set the TCP port for callagent messages "
 				 "(if other than the default of 2727)",
 				 10, &global_mgcp_callagent_tcp_port);
 
-  prefs_register_uint_preference(mgcp_module, "udp.callagent_port", 
+  prefs_register_uint_preference(mgcp_module, "udp.callagent_port",
 				 "MGCP Callagent UDP Port",
 				 "Set the UDP port for callagent messages "
 				 "(if other than the default of 2727)",
 				 10, &global_mgcp_callagent_udp_port);
 
 
-  prefs_register_bool_preference(mgcp_module, "display_raw_text", 
-                                 "Display raw text for MGCP message", 
+  prefs_register_bool_preference(mgcp_module, "display_raw_text",
+                                 "Display raw text for MGCP message",
                                  "Specifies that the raw text of the "
                                  "MGCP message should be displayed "
 				 "instead of (or in addition to) the "
 				 "dissection tree",
                                  &global_mgcp_raw_text);
 
-  prefs_register_bool_preference(mgcp_module, "display_dissect_tree", 
-                                 "Display tree dissection for MGCP message", 
+  prefs_register_bool_preference(mgcp_module, "display_dissect_tree",
+                                 "Display tree dissection for MGCP message",
                                  "Specifies that the dissection tree of the "
                                  "MGCP message should be displayed "
 				 "instead of (or in addition to) the "
 				 "raw text",
                                  &global_mgcp_dissect_tree);
 
-  prefs_register_bool_preference(mgcp_module, "display_mgcp_message_count", 
-                                 "Display the number of MGCP messages", 
+  prefs_register_bool_preference(mgcp_module, "display_mgcp_message_count",
+                                 "Display the number of MGCP messages",
                                  "Display the number of MGCP messages "
                                  "found in a packet in the protocol column.",
                                  &global_mgcp_message_count);
@@ -588,15 +588,15 @@ proto_reg_handoff_mgcp(void)
 
 }
 
-/* 
- * is_mgcp_verb - A function for determining whether there is a 
+/*
+ * is_mgcp_verb - A function for determining whether there is a
  *                MGCP verb at offset in tvb
  *
  * Parameter:
  * tvb - The tvbuff in which we are looking for an MGCP verb
  * offset - The offset in tvb at which we are looking for a MGCP verb
- * maxlength - The maximum distance from offset we may look for the 
- *             characters that make up a MGCP verb.  
+ * maxlength - The maximum distance from offset we may look for the
+ *             characters that make up a MGCP verb.
  *
  * Return: TRUE if there is an MGCP verb at offset in tvb, otherwise FALSE
  */
@@ -621,7 +621,7 @@ static gboolean is_mgcp_verb(tvbuff_t *tvb, gint offset, gint maxlength){
       returnvalue = TRUE;
     }
   }
-  if( returnvalue && maxlength >= 5 && 
+  if( returnvalue && maxlength >= 5 &&
       (word[0] = tvb_get_guint8(tvb,4)) != ' ' && word[0] != '\t'){
     returnvalue = FALSE;
   }
@@ -629,32 +629,32 @@ static gboolean is_mgcp_verb(tvbuff_t *tvb, gint offset, gint maxlength){
 }
 
 /*
- * is_mgcp_rspcode - A function for determining whether something which 
- *                   looks roughly like a MGCP response code is at 
+ * is_mgcp_rspcode - A function for determining whether something which
+ *                   looks roughly like a MGCP response code is at
  *                   offset in tvb
  *
  * Parameters:
  * tvb - The tvbuff in which we are looking for an MGCP response code
  * offset - The offset in tvb at which we are looking for a MGCP response code
- * maxlength - The maximum distance from offset we may look for the 
- *             characters that make up a MGCP response code.  
+ * maxlength - The maximum distance from offset we may look for the
+ *             characters that make up a MGCP response code.
  *
- * Return: TRUE if there is an MGCP response code at offset in tvb, 
+ * Return: TRUE if there is an MGCP response code at offset in tvb,
  *         otherwise FALSE
  */
 
 static gboolean is_mgcp_rspcode(tvbuff_t *tvb, gint offset, gint maxlength){
   int returnvalue = FALSE;
   guint8 word[4];
-  if(maxlength >= 3){  
+  if(maxlength >= 3){
     tvb_get_nstringz0(tvb,offset,3,word);
     if( isdigit(word[0]) &&
 	isdigit(word[1]) &&
-	isdigit(word[2])){ 
+	isdigit(word[2])){
       returnvalue = TRUE;
     }
   }
-  if( returnvalue && maxlength >= 4 && 
+  if( returnvalue && maxlength >= 4 &&
       (word[0] = tvb_get_guint8(tvb,3)) != ' ' && word[0] != '\t'){
     returnvalue = FALSE;
   }
@@ -662,11 +662,11 @@ static gboolean is_mgcp_rspcode(tvbuff_t *tvb, gint offset, gint maxlength){
 }
 
 /*
- * is_rfc2234_alpha - Indicates whether the character c is an alphabetical 
- *                    character.  This function is used instead of 
+ * is_rfc2234_alpha - Indicates whether the character c is an alphabetical
+ *                    character.  This function is used instead of
  *                    isalpha because isalpha may deviate from the rfc2234
  *                    definition of ALPHA in some locales.
- * 
+ *
  * Parameter:
  * c - The character being checked for being an alphabetical character.
  *
@@ -681,20 +681,20 @@ static gboolean is_rfc2234_alpha(guint8 c){
   }
   return returnvalue;
 }
-  
+
 /*
  * tvb_parse_param - Parse the MGCP param into a type and a value.
  *
  * Parameters:
  * tvb - The tvbuff containing the MGCP param we are to parse.
- * offset - The offset in tvb at which we will begin looking for a 
+ * offset - The offset in tvb at which we will begin looking for a
  *          MGCP parameter to parse.
  * len - The maximum distance from offset in tvb that we can look for
  *       an MGCP parameter to parse.
- * hf - The place to write a pointer to the integer representing the 
+ * hf - The place to write a pointer to the integer representing the
  *      header field associated with the MGCP parameter parsed.
  *
- * Returns: The offset in tvb where the value of the MGCP parameter 
+ * Returns: The offset in tvb where the value of the MGCP parameter
  *          begins.
  */
 static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
@@ -717,8 +717,8 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
       break;
     case 'I':
       tvb_current_offset++;
-      if(len > (tvb_current_offset - offset) && 
-	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){ 
+      if(len > (tvb_current_offset - offset) &&
+	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){
 	*hf = &hf_mgcp_param_connectionid;
 	tvb_current_offset--;
       }
@@ -731,17 +731,17 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
       break;
     case 'X':
       tvb_current_offset++;
-      if(len > (tvb_current_offset - offset) && 
+      if(len > (tvb_current_offset - offset) &&
 	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){
 	*hf = &hf_mgcp_param_requestid;
       }
       else if(len > (tvb_current_offset - offset) && (
-	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == '-' || 
+	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == '-' ||
 	 tempchar == '+')){
 	tvb_current_offset++;
 	for(counter = 1;(counter <= 6) && (len > (counter + tvb_current_offset
 						  - offset))
-	      && ( is_rfc2234_alpha(tempchar = 
+	      && ( is_rfc2234_alpha(tempchar =
 				    tvb_get_guint8(tvb,
 						   tvb_current_offset+counter))
 		   || isdigit(tempchar));counter++);
@@ -749,7 +749,7 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
 	  tvb_current_offset += counter;
 	  *hf = &hf_mgcp_param_extention;
 	}
-      } 
+      }
       tvb_current_offset--;
       break;
     case 'L':
@@ -760,8 +760,8 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
       break;
     case 'R':
       tvb_current_offset++;
-      if(len > (tvb_current_offset - offset) && 
-	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){ 
+      if(len > (tvb_current_offset - offset) &&
+	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){
 	*hf = &hf_mgcp_param_reqevents;
 	tvb_current_offset--;
       }
@@ -786,8 +786,8 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
       break;
     case 'E':
       tvb_current_offset++;
-      if(len > (tvb_current_offset - offset) && 
-	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){ 
+      if(len > (tvb_current_offset - offset) &&
+	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){
 	*hf = &hf_mgcp_param_reasoncode;
 	tvb_current_offset--;
       }
@@ -797,8 +797,8 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
       break;
     case 'Z':
       tvb_current_offset++;
-      if(len > (tvb_current_offset - offset) && 
-	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){ 
+      if(len > (tvb_current_offset - offset) &&
+	 (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){
 	*hf = &hf_mgcp_param_specificendpoint;
 	tvb_current_offset--;
       }
@@ -825,9 +825,9 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
       *hf = &hf_mgcp_param_invalid;
       break;
     }
-    
+
     tvb_current_offset++;
-    if(*hf != NULL && len > (tvb_current_offset - offset) && 
+    if(*hf != NULL && len > (tvb_current_offset - offset) &&
        (tempchar = tvb_get_guint8(tvb,tvb_current_offset)) == ':'){
       tvb_current_offset++;
       tvb_current_offset = tvb_skip_wsp(tvb,tvb_current_offset,
@@ -848,23 +848,23 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf){
 }
 
 
-/* 
+/*
  * dissect_mgcp_firstline - Dissects the firstline of an MGCP message.
- *                          Adds the appropriate headers fields to   
- *                          tree for the dissection of the first line 
+ *                          Adds the appropriate headers fields to
+ *                          tree for the dissection of the first line
  *                          of an MGCP message.
- * 
+ *
  * Parameters:
- * tvb - The tvb containing the first line of an MGCP message.  This 
- *       tvb is presumed to ONLY contain the first line of the MGCP 
+ * tvb - The tvb containing the first line of an MGCP message.  This
+ *       tvb is presumed to ONLY contain the first line of the MGCP
  *       message.
- * pinfo - The packet info for the packet.  This is not really used 
- *         by this function but is passed through so as to retain the 
+ * pinfo - The packet info for the packet.  This is not really used
+ *         by this function but is passed through so as to retain the
  *         style of a dissector.
- * tree - The tree from which to hang the structured information parsed 
+ * tree - The tree from which to hang the structured information parsed
  *        from the first line of the MGCP message.
  */
-static void dissect_mgcp_firstline(tvbuff_t *tvb, 
+static void dissect_mgcp_firstline(tvbuff_t *tvb,
 				   proto_tree *tree){
   gint tvb_current_offset,tvb_previous_offset,tvb_len,tvb_current_len;
   gint tokennum, tokenlen;
@@ -893,15 +893,15 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb,
       if(tvb_current_offset == -1){
 	tvb_current_offset = tvb_len;
 	tokenlen = tvb_current_len;
-      }				  
+      }
       else{
 	tokenlen = tvb_current_offset - tvb_previous_offset;
       }
       if(tokennum == 0){
 	if(is_mgcp_verb(tvb,tvb_previous_offset,tvb_current_len)){
 	  mgcp_type = MGCP_REQUEST;
-	  my_proto_tree_add_string(tree,hf_mgcp_req_verb, tvb, 
-				   tvb_previous_offset, tokenlen, 
+	  my_proto_tree_add_string(tree,hf_mgcp_req_verb, tvb,
+				   tvb_previous_offset, tokenlen,
 				   tvb_format_text(tvb,tvb_previous_offset
 						   ,tokenlen));
 	}
@@ -918,7 +918,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb,
       }
       if(tokennum == 1){
 	my_proto_tree_add_string(tree,hf_mgcp_transid, tvb,
-				 tvb_previous_offset, tokenlen, 
+				 tvb_previous_offset, tokenlen,
 				 tvb_format_text(tvb,tvb_previous_offset,
 						 tokenlen));
       }
@@ -931,7 +931,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb,
 	}
 	else if(mgcp_type == MGCP_RESPONSE){
 	  if(tvb_current_offset < tvb_len){
-	    tokenlen = tvb_find_line_end(tvb, tvb_previous_offset, 
+	    tokenlen = tvb_find_line_end(tvb, tvb_previous_offset,
 					 -1,&tvb_current_offset,FALSE);
 	  }
 	  else{
@@ -946,7 +946,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb,
       }
       if( (tokennum == 3 && mgcp_type == MGCP_REQUEST) ){
 	if(tvb_current_offset < tvb_len ){
-	  tokenlen = tvb_find_line_end(tvb, tvb_previous_offset, 
+	  tokenlen = tvb_find_line_end(tvb, tvb_previous_offset,
 				       -1,&tvb_current_offset,FALSE);
 	}
 	else{
@@ -963,7 +963,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb,
 					   tvb_current_len);
       }
       tokennum++;
-    } while( tvb_current_offset < tvb_len && tvb_previous_offset < tvb_len 
+    } while( tvb_current_offset < tvb_len && tvb_previous_offset < tvb_len
 	     && tokennum <= 3);
     switch (mgcp_type){
     case MGCP_RESPONSE:
@@ -978,20 +978,20 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb,
   }
 }
 
-/* 
+/*
  * dissect_mgcp_params - Dissects the parameters of an MGCP message.
- *                       Adds the appropriate headers fields to   
- *                       tree for the dissection of the parameters 
+ *                       Adds the appropriate headers fields to
+ *                       tree for the dissection of the parameters
  *                       of an MGCP message.
- * 
+ *
  * Parameters:
- * tvb - The tvb containing the parameters of an MGCP message.  This 
- *       tvb is presumed to ONLY contain the part of the MGCP 
+ * tvb - The tvb containing the parameters of an MGCP message.  This
+ *       tvb is presumed to ONLY contain the part of the MGCP
  *       message which contains the MGCP parameters.
- * pinfo - The packet info for the packet.  This is not really used 
- *         by this function but is passed through so as to retain the 
+ * pinfo - The packet info for the packet.  This is not really used
+ *         by this function but is passed through so as to retain the
  *         style of a dissector.
- * tree - The tree from which to hang the structured information parsed 
+ * tree - The tree from which to hang the structured information parsed
  *        from the parameters of the MGCP message.
  */
 static void dissect_mgcp_params(tvbuff_t *tvb, proto_tree *tree){
@@ -1010,7 +1010,7 @@ static void dissect_mgcp_params(tvbuff_t *tvb, proto_tree *tree){
   if(tree){
     if(global_mgcp_dissect_tree){
       my_proto_tree_add_string = proto_tree_add_string;
-      mgcp_param_ti = proto_tree_add_item(tree, proto_mgcp, tvb, 
+      mgcp_param_ti = proto_tree_add_item(tree, proto_mgcp, tvb,
 					  tvb_linebegin, tvb_len, FALSE);
       proto_item_set_text(mgcp_param_ti, "Parameters");
       mgcp_param_tree = proto_item_add_subtree(mgcp_param_ti, ett_mgcp_param);
@@ -1024,32 +1024,32 @@ static void dissect_mgcp_params(tvbuff_t *tvb, proto_tree *tree){
     /* Parse the parameters */
     while(tvb_lineend < tvb_len){
       linelen = tvb_find_line_end(tvb, tvb_linebegin, -1,&tvb_lineend,FALSE);
-      tvb_tokenbegin = tvb_parse_param(tvb, tvb_linebegin, linelen, 
+      tvb_tokenbegin = tvb_parse_param(tvb, tvb_linebegin, linelen,
 				       &my_param);
       if( my_param != NULL ){
 	tokenlen = tvb_find_line_end(tvb,tvb_tokenbegin,-1,&tvb_lineend,FALSE);
 	my_proto_tree_add_string(mgcp_param_tree,*my_param, tvb,
-				 tvb_linebegin, linelen, 
+				 tvb_linebegin, linelen,
 				 tvb_format_text(tvb,tvb_tokenbegin,
 						 tokenlen));
       }
       tvb_linebegin = tvb_lineend;
-    } 
+    }
   }
-}  
-	  
+}
+
 /*
- * tvb_skip_wsp - Returns the position in tvb of the first non-whitespace 
+ * tvb_skip_wsp - Returns the position in tvb of the first non-whitespace
  *                character following offset or offset + maxlength -1 whichever
  *                is smaller.
  *
- * Parameters: 
+ * Parameters:
  * tvb - The tvbuff in which we are skipping whitespace.
  * offset - The offset in tvb from which we begin trying to skip whitespace.
- * maxlength - The maximum distance from offset that we may try to skip 
+ * maxlength - The maximum distance from offset that we may try to skip
  * whitespace.
  *
- * Returns: The position in tvb of the first non-whitespace 
+ * Returns: The position in tvb of the first non-whitespace
  *          character following offset or offset + maxlength -1 whichever
  *          is smaller.
  */
@@ -1062,33 +1062,33 @@ static gint tvb_skip_wsp(tvbuff_t* tvb, gint offset, gint maxlength){
   if(end >= tvb_len){
     end = tvb_len;
   }
-  for(counter = offset; counter < end && 
-	((tempchar = tvb_get_guint8(tvb,counter)) == ' ' || 
+  for(counter = offset; counter < end &&
+	((tempchar = tvb_get_guint8(tvb,counter)) == ' ' ||
 	tempchar == '\t');counter++);
   return (counter);
 }
 
 /*
  * tvb_find_null_line - Returns the length from offset to the first null
- *                      line found (a null line is a line that begins 
+ *                      line found (a null line is a line that begins
  *                      with a CR or LF.  The offset to the first character
  *                      after the null line is written into the gint pointed
  *                      to by next_offset.
  *
- * Parameters: 
+ * Parameters:
  * tvb - The tvbuff in which we are looking for a null line.
- * offset - The offset in tvb at which we will begin looking for 
+ * offset - The offset in tvb at which we will begin looking for
  *          a null line.
- * len - The maximum distance from offset in tvb that we will look for 
+ * len - The maximum distance from offset in tvb that we will look for
  *       a null line.  If it is -1 we will look to the end of the buffer.
  *
- * next_offset - The location to write the offset of first character 
- *               FOLLOWING the null line. 
+ * next_offset - The location to write the offset of first character
+ *               FOLLOWING the null line.
  *
- * Returns: The length from offset to the first character BEFORE 
+ * Returns: The length from offset to the first character BEFORE
  *          the null line..
  */
-static gint tvb_find_null_line(tvbuff_t* tvb, gint offset, 
+static gint tvb_find_null_line(tvbuff_t* tvb, gint offset,
 			       gint len, gint* next_offset){
   gint tvb_lineend,tvb_current_len,tvb_linebegin,maxoffset;
   guint tempchar;
@@ -1096,12 +1096,12 @@ static gint tvb_find_null_line(tvbuff_t* tvb, gint offset,
   tvb_linebegin = offset;
   tvb_lineend = tvb_linebegin;
 
-  /* Simple setup to allow for the traditional -1 search to the end 
-   * of the tvbuff 
+  /* Simple setup to allow for the traditional -1 search to the end
+   * of the tvbuff
    */
   if(len != -1){
     tvb_current_len = len;
-  } 
+  }
   else{
     tvb_current_len = tvb_length_remaining(tvb,offset);
   }
@@ -1116,7 +1116,7 @@ static gint tvb_find_null_line(tvbuff_t* tvb, gint offset,
     tvb_current_len = tvb_length_remaining(tvb,tvb_linebegin);
     tvb_find_line_end(tvb, tvb_linebegin, tvb_current_len, &tvb_lineend,FALSE);
     tempchar = tvb_get_guint8(tvb,tvb_linebegin);
-  } 
+  }
   while( tempchar != '\r' && tempchar != '\n' &&
 	 tvb_lineend <= maxoffset);
 
@@ -1133,27 +1133,27 @@ static gint tvb_find_null_line(tvbuff_t* tvb, gint offset,
 }
 
 /*
- * tvb_find_dot_line -  Returns the length from offset to the first line 
- *                      containing only a dot (.) character.  A line 
- *                      containing only a dot is used to indicate a 
- *                      separation between multiple MGCP messages 
+ * tvb_find_dot_line -  Returns the length from offset to the first line
+ *                      containing only a dot (.) character.  A line
+ *                      containing only a dot is used to indicate a
+ *                      separation between multiple MGCP messages
  *                      piggybacked in the same UDP packet.
  *
- * Parameters: 
+ * Parameters:
  * tvb - The tvbuff in which we are looking for a dot line.
- * offset - The offset in tvb at which we will begin looking for 
+ * offset - The offset in tvb at which we will begin looking for
  *          a dot line.
- * len - The maximum distance from offset in tvb that we will look for 
+ * len - The maximum distance from offset in tvb that we will look for
  *       a dot line.  If it is -1 we will look to the end of the buffer.
  *
- * next_offset - The location to write the offset of first character 
- *               FOLLOWING the dot line.  
+ * next_offset - The location to write the offset of first character
+ *               FOLLOWING the dot line.
  *
- * Returns: The length from offset to the first character BEFORE 
- *          the dot line or -1 if the character at offset is a . 
+ * Returns: The length from offset to the first character BEFORE
+ *          the dot line or -1 if the character at offset is a .
  *          followed by a newline or a carriage return.
  */
-static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset, 
+static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset,
 			       gint len, gint* next_offset){
   gint tvb_current_offset, tvb_current_len, maxoffset,tvb_len;
   guint8 tempchar;
@@ -1165,7 +1165,7 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset,
   if(len == -1){
     maxoffset = ( tvb_len - 1 );
   }
-  else { 
+  else {
     maxoffset = (len - 1 ) + offset;
   }
   tvb_current_offset = offset -1;
@@ -1173,17 +1173,17 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset,
     tvb_current_offset = tvb_find_guint8(tvb, tvb_current_offset+1,
 					 tvb_current_len, '.');
     tvb_current_len = maxoffset - tvb_current_offset + 1;
-    /* 
+    /*
      * if we didn't find a . then break out of the loop
      */
     if(tvb_current_offset == -1){
       break;
     }
     /* do we have and characters following the . ? */
-    if( tvb_current_offset < maxoffset ) { 
+    if( tvb_current_offset < maxoffset ) {
       tempchar = tvb_get_guint8(tvb,tvb_current_offset+1);
-      /* 
-       * are the characters that follow the dot a newline or carriage return ? 
+      /*
+       * are the characters that follow the dot a newline or carriage return ?
        */
       if(tempchar == '\r' || tempchar == '\n'){
 	/*
@@ -1195,7 +1195,7 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset,
 	else {
 	  tempchar = tvb_get_guint8(tvb,tvb_current_offset-1);
 	  /*
-	   * are the characters that follow the dot a newline or a carriage 
+	   * are the characters that follow the dot a newline or a carriage
 	   * return ?
 	   */
 	  if(tempchar == '\r' || tempchar == '\n'){
@@ -1214,10 +1214,10 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset,
 	  break;
 	}
       }
-    }    
+    }
   } while (tvb_current_offset < maxoffset);
-  /* 
-   * so now we either have the tvb_current_offset of a . in a dot line 
+  /*
+   * so now we either have the tvb_current_offset of a . in a dot line
    * or a tvb_current_offset of -1
    */
   if(tvb_current_offset == -1){
@@ -1230,11 +1230,11 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset,
 
   if( tvb_current_offset == offset ){
     tvb_current_len = -1;
-  }  
+  }
   else {
     tvb_current_len = tvb_current_offset - offset;
   }
-  return tvb_current_len;  
+  return tvb_current_len;
 }
 
 /* Start the functions we need for the plugin stuff */
diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c
index 13f3beab72..8a82b95c9b 100644
--- a/plugins/plugin_api.c
+++ b/plugins/plugin_api.c
@@ -1,21 +1,21 @@
 /* plugin_api.c
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.c,v 1.41 2002/08/14 19:18:20 guy Exp $
+ * $Id: plugin_api.c,v 1.42 2002/08/28 20:38:57 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- * 
+ *
  * 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.
@@ -144,7 +144,7 @@ plugin_address_table_init(plugin_address_table_t *pat)
 	p_register_giop_user			= pat->p_register_giop_user;
 	p_is_big_endian				= pat->p_is_big_endian;
 	p_get_CDR_encap_info                    = pat->p_get_CDR_encap_info;
- 
+
 	p_get_CDR_any				= pat->p_get_CDR_any;
 	p_get_CDR_boolean			= pat->p_get_CDR_boolean;
 	p_get_CDR_char				= pat->p_get_CDR_char;
@@ -174,11 +174,11 @@ plugin_address_table_init(plugin_address_table_t *pat)
 	p_decode_enumerated_bitfield		= pat->p_decode_enumerated_bitfield;
 	p_register_dissector_table		= pat->p_register_dissector_table;
 	p_except_throw				= pat->p_except_throw;
-	p_dissector_try_port			= pat->p_dissector_try_port; 
+	p_dissector_try_port			= pat->p_dissector_try_port;
 
-	p_conversation_add_proto_data		= pat->p_conversation_add_proto_data; 
-	p_conversation_get_proto_data		= pat->p_conversation_get_proto_data; 
-	p_conversation_delete_proto_data	= pat->p_conversation_delete_proto_data; 
-	p_p_add_proto_data			= pat->p_p_add_proto_data; 
-	p_p_get_proto_data			= pat->p_p_get_proto_data; 
+	p_conversation_add_proto_data		= pat->p_conversation_add_proto_data;
+	p_conversation_get_proto_data		= pat->p_conversation_get_proto_data;
+	p_conversation_delete_proto_data	= pat->p_conversation_delete_proto_data;
+	p_p_add_proto_data			= pat->p_p_add_proto_data;
+	p_p_get_proto_data			= pat->p_p_get_proto_data;
 }
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index 01ca5d83e5..d309e288ea 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -1,21 +1,21 @@
 /* plugin_api.h
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.h,v 1.42 2002/08/14 19:18:20 guy Exp $
+ * $Id: plugin_api.h,v 1.43 2002/08/28 20:38:57 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- * 
+ *
  * 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.
diff --git a/plugins/plugin_api_decls.h b/plugins/plugin_api_decls.h
index 98b1091d8d..a9796c0739 100644
--- a/plugins/plugin_api_decls.h
+++ b/plugins/plugin_api_decls.h
@@ -2,21 +2,21 @@
  * Declarations of a list of "p_" names; included in various places
  * to declare them as variables or as function members.
  *
- * $Id: plugin_api_decls.h,v 1.4 2002/08/14 19:18:20 guy Exp $
+ * $Id: plugin_api_decls.h,v 1.5 2002/08/28 20:38:57 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- * 
+ *
  * 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.
diff --git a/plugins/plugin_api_defs.h b/plugins/plugin_api_defs.h
index 24153f6c11..9f9365ebb5 100644
--- a/plugins/plugin_api_defs.h
+++ b/plugins/plugin_api_defs.h
@@ -1,21 +1,21 @@
 /* plugin_api_defs.h
  * Define the variables that hold pointers to plugin API functions
  *
- * $Id: plugin_api_defs.h,v 1.14 2002/05/05 00:16:36 guy Exp $
+ * $Id: plugin_api_defs.h,v 1.15 2002/08/28 20:38:58 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- * 
+ *
  * 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.
diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h
index e3c067dde2..280ce8c4a4 100644
--- a/plugins/plugin_table.h
+++ b/plugins/plugin_table.h
@@ -1,21 +1,21 @@
 /* plugin_table.h
  * Table of exported addresses for Ethereal plugins.
  *
- * $Id: plugin_table.h,v 1.52 2002/08/14 19:18:20 guy Exp $
+ * $Id: plugin_table.h,v 1.53 2002/08/28 20:38:58 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- * 
+ *
  * 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.
@@ -46,9 +46,9 @@ typedef void (*addr_register_postseq_cleanup_routine)(void (*func)(void));
 typedef gchar* (*addr_match_strval)(guint32, const value_string*);
 typedef gchar* (*addr_val_to_str)(guint32, const value_string *, const char *);
 
-typedef conversation_t *(*addr_conversation_new)(address *, address *, 
+typedef conversation_t *(*addr_conversation_new)(address *, address *,
     port_type, guint32, guint32, guint);
-typedef conversation_t *(*addr_find_conversation)(address *, address *, 
+typedef conversation_t *(*addr_find_conversation)(address *, address *,
     port_type, guint32, guint32, guint);
 typedef void (*addr_conversation_set_dissector)(conversation_t *,
     dissector_handle_t);
author	Jörg Mayer <jmayer@loplof.de>	2002-08-28 20:41:00 +0000
committer	Jörg Mayer <jmayer@loplof.de>	2002-08-28 20:41:00 +0000
commit	48be4e530d6635dbf1ef1dafa984c2060f3caa8a (patch)
tree	fc136de37c7e939ec0c5fc83dbf48297b9650816 /plugins
parent	64b6acac6dae4c18aa1aebf368923c4bef8ed221 (diff)
download	wireshark-48be4e530d6635dbf1ef1dafa984c2060f3caa8a.tar.gz wireshark-48be4e530d6635dbf1ef1dafa984c2060f3caa8a.tar.bz2 wireshark-48be4e530d6635dbf1ef1dafa984c2060f3caa8a.zip