Don't let the user specify a maximum capture file size if they're not
[obnox/wireshark/wip.git] / packet-isis-hello.c
index ebd076d77aa2334a6f9a3fb50fe6566bf80ebbf3..061ff9db27beb2b117b1e0d2edc951f00fa4c1b5 100644 (file)
@@ -1,7 +1,7 @@
 /* packet-isis-hello.c
  * Routines for decoding isis hello packets and their CLVs
  *
- * $Id: packet-isis-hello.c,v 1.18 2001/06/26 20:50:30 guy Exp $
+ * $Id: packet-isis-hello.c,v 1.23 2001/12/20 07:33:21 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -21,8 +21,6 @@
  * 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.
- *
- *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -43,7 +41,6 @@
 #include "packet-isis-hello.h"
 
 /* hello packets */
-static int proto_isis_hello                  = -1;
 static int hf_isis_hello_circuit_reserved    = -1;
 static int hf_isis_hello_source_id           = -1;
 static int hf_isis_hello_holding_timer       = -1;
@@ -78,25 +75,33 @@ static const value_string isis_hello_circuit_type_vals[] = {
 /* 
  * Predclare dissectors for use in clv dissection.
  */
-static void dissect_hello_area_address_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-static void dissect_hello_is_neighbors_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-static void dissect_hello_padding_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-static void dissect_hello_nlpid_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-static void dissect_hello_ip_int_addr_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-static void dissect_hello_ipv6_int_addr_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-static void dissect_hello_auth_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-static void dissect_hello_ptp_adj_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-static void dissect_hello_mt_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree);
-
+static void dissect_hello_padding_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
+static void dissect_hello_is_neighbors_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
+static void dissect_hello_ptp_adj_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
+static void dissect_hello_area_address_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
+static void dissect_hello_auth_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
+static void dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
+static void dissect_hello_ip_int_addr_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
+static void dissect_hello_mt_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
+static void dissect_hello_nlpid_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length);
 
 
 static const isis_clv_handle_t clv_l1_hello_opts[] = {
@@ -270,7 +275,7 @@ static const isis_clv_handle_t clv_ptp_hello_opts[] = {
        },
        {
                ISIS_CLV_PTP_ADJ,
-               "point-to-point Adjacency State",
+               "Point-to-point Adjacency State",
                &ett_isis_hello_clv_ptp_adj,
                dissect_hello_ptp_adj_clv
        },
@@ -296,20 +301,22 @@ static const isis_clv_handle_t clv_ptp_hello_opts[] = {
  *     clv common one.
  *
  * Input:
- *     u_char * : packet data
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : proto tree to build on (may be null)
  *     int : current offset into packet data
- *     guint : length of this clv
  *     int : length of IDs in packet.
- *     frame_data * : frame data
- *     proto_tree * : proto tree to build on (may be null)
+ *     int : length of this clv
  *
  * Output:
  *     void, will modify proto_tree if not null.
  */
 static void 
-dissect_hello_nlpid_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree) {
-       isis_dissect_nlpid_clv(pd, offset, length, fd, tree );
+dissect_hello_nlpid_clv(tvbuff_t *tvb, 
+       packet_info *pinfo, proto_tree *tree, int offset, 
+       int id_length, int length)
+{
+       isis_dissect_nlpid_clv(tvb, pinfo, tree, offset, length);
 }
 
 /*
@@ -320,21 +327,23 @@ dissect_hello_nlpid_clv(const u_char *pd, int offset,
  *     clv common one.
  *
  * Input:
- *     u_char * : packet data
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : proto tree to build on (may be null)
  *     int : current offset into packet data
- *     guint : length of this clv
  *     int : length of IDs in packet.
- *     frame_data * : frame data
- *     proto_tree * : proto tree to build on (may be null)
+ *     int : length of this clv
  *
  * Output:
  *     void, will modify proto_tree if not null.
  */
 
 static void 
-dissect_hello_mt_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree) {
-       isis_dissect_mt_clv(pd, offset, length, fd, tree,
+dissect_hello_mt_clv(tvbuff_t *tvb, 
+       packet_info *pinfo, proto_tree *tree, int offset, 
+       int id_length, int length)
+{
+       isis_dissect_mt_clv(tvb, pinfo, tree, offset, length,
                hf_isis_hello_clv_mt );
 }
 
@@ -346,20 +355,22 @@ dissect_hello_mt_clv(const u_char *pd, int offset,
  *     clv common one.
  *
  * Input:
- *     u_char * : packet data
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : proto tree to build on (may be null)
  *     int : current offset into packet data
- *     guint : length of this clv
  *     int : length of IDs in packet.
- *     frame_data * : frame data
- *     proto_tree * : proto tree to build on (may be null)
+ *     int : length of this clv
  *
  * Output:
  *     void, will modify proto_tree if not null.
  */
 static void 
-dissect_hello_ip_int_addr_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree) {
-       isis_dissect_ip_int_clv(pd, offset, length, fd, tree, 
+dissect_hello_ip_int_addr_clv(tvbuff_t *tvb, 
+       packet_info *pinfo, proto_tree *tree, int offset, 
+       int id_length, int length)
+{
+       isis_dissect_ip_int_clv(tvb, pinfo, tree, offset, length,
                hf_isis_hello_clv_ipv4_int_addr );
 }
 
@@ -371,20 +382,22 @@ dissect_hello_ip_int_addr_clv(const u_char *pd, int offset,
  *     clv common one.
  *
  * Input:
- *     u_char * : packet data
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : proto tree to build on (may be null)
  *     int : current offset into packet data
- *     guint : length of this clv
  *     int : length of IDs in packet.
- *     frame_data * : frame data
- *     proto_tree * : proto tree to build on (may be null)
+ *     int : length of this clv
  *
  * Output:
  *     void, will modify proto_tree if not null.
  */
 static void 
-dissect_hello_ipv6_int_addr_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree) {
-       isis_dissect_ipv6_int_clv(pd, offset, length, fd, tree, 
+dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, 
+       packet_info *pinfo, proto_tree *tree, int offset, 
+       int id_length, int length)
+{
+       isis_dissect_ipv6_int_clv(tvb, pinfo, tree, offset, length,
                hf_isis_hello_clv_ipv6_int_addr );
 }
 
@@ -397,21 +410,23 @@ dissect_hello_ipv6_int_addr_clv(const u_char *pd, int offset,
  *     password.
  *
  * Input:
- *     u_char * : packet data
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : proto tree to build on (may be null)
  *     int : current offset into packet data
- *     guint : length of this clv
  *     int : length of IDs in packet.
- *     frame_data * : frame data
- *     proto_tree * : proto tree to build on (may be null)
+ *     int : length of this clv
  *
  * Output:
  *     void, will modify proto_tree if not null.
  */
 static void 
-dissect_hello_auth_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree) {
-       isis_dissect_authentication_clv(pd, offset, length, fd, tree, 
-               "authentication" );
+dissect_hello_auth_clv(tvbuff_t *tvb, 
+       packet_info *pinfo, proto_tree *tree, int offset, 
+       int id_length, int length)
+{
+       isis_dissect_authentication_clv(tvb, pinfo, tree, offset,
+               length, "authentication" );
 }
 
 /*
@@ -422,29 +437,34 @@ dissect_hello_auth_clv(const u_char *pd, int offset,
  *     clv common one.
  *
  * Input:
- *     u_char * : packet data
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : proto tree to build on (may be null)
  *     int : current offset into packet data
- *     guint : length of this clv
  *     int : length of IDs in packet.
- *     frame_data * : frame data
- *     proto_tree * : proto tree to build on (may be null)
+ *     int : length of this clv
  *
  * Output:
  *     void, will modify proto_tree if not null.
  */
 static void 
-dissect_hello_area_address_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree) {
-       isis_dissect_area_address_clv(pd, offset, length, fd, tree );
+dissect_hello_area_address_clv(tvbuff_t *tvb, 
+       packet_info *pinfo, proto_tree *tree, int offset, 
+       int id_length, int length)
+{
+       isis_dissect_area_address_clv(tvb, pinfo, tree, offset, length);
 }
 
-void
-dissect_hello_ptp_adj_clv(const u_char *pd, int offset,
-               guint length, int id_length, frame_data *fd, proto_tree *tree ) {
 
+
+static void 
+dissect_hello_ptp_adj_clv(tvbuff_t *tvb, 
+               packet_info *pinfo, proto_tree *tree, int offset, 
+               int id_length, int length)
+{
         char adj_state[20];
 
-       switch((int)*(pd+offset)) {
+       switch(tvb_get_guint8(tvb, offset)) {
          case 0:
            strcpy(adj_state,"Up");
            break;
@@ -460,35 +480,35 @@ dissect_hello_ptp_adj_clv(const u_char *pd, int offset,
 
        switch(length) {
          case 1:
-           proto_tree_add_text ( tree, NullTVB, offset, 1,
+           proto_tree_add_text ( tree, tvb, offset, 1,
                                  "Adjacency State: %s", adj_state );
            break;
          case 5:
-           proto_tree_add_text ( tree, NullTVB, offset, 1,        
+           proto_tree_add_text ( tree, tvb, offset, 1,        
                                   "Adjacency State: %s", adj_state ); 
-           proto_tree_add_text ( tree, NullTVB, offset+1, 4,        
-                                  "Extended Local Circuit ID: %d", (gint32)*(pd+offset+1) ); 
+           proto_tree_add_text ( tree, tvb, offset+1, 4,        
+                                  "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); 
            break;
          case 11:
-            proto_tree_add_text ( tree, NullTVB, offset, 1,
+            proto_tree_add_text ( tree, tvb, offset, 1,
                                   "Adjacency State: %s", adj_state );
-            proto_tree_add_text ( tree, NullTVB, offset+1, 4,
-                                  "Extended Local Circuit ID: %d", (gint32)*(pd+offset+1) );
-            proto_tree_add_text ( tree, NullTVB, offset+5, 6,
-                                  "Neighbor System ID: %s", print_system_id( pd+offset+5, 6 ) );
+            proto_tree_add_text ( tree, tvb, offset+1, 4,
+                                  "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) );
+            proto_tree_add_text ( tree, tvb, offset+5, 6,
+                                  "Neighbor SystemID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, 6), 6 ) );
            break;
          case 15:
-           proto_tree_add_text ( tree, NullTVB, offset, 1,
+           proto_tree_add_text ( tree, tvb, offset, 1,
                                   "Adjacency State: %s", adj_state );
-            proto_tree_add_text ( tree, NullTVB, offset+1, 4,
-                                  "Extended Local Circuit ID: %d", (gint32)*(pd+offset+1) );
-            proto_tree_add_text ( tree, NullTVB, offset+5, 6,
-                                  "Neighbor System ID: %s", print_system_id( pd+offset+5, 6 ) );  
-            proto_tree_add_text ( tree, NullTVB, offset+11, 4,
-                                  "Neighbor Extended Local Circuit ID: %d", (gint32)*(pd+offset+11) );
+            proto_tree_add_text ( tree, tvb, offset+1, 4,
+                                  "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) );
+            proto_tree_add_text ( tree, tvb, offset+5, 6,
+                                  "Neighbor SystemID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, 6), 6 ) );  
+            proto_tree_add_text ( tree, tvb, offset+11, 4,
+                                  "Neighbor Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+11) );
            break;
          default:
-           isis_dissect_unknown(offset, length, tree, fd,
+           isis_dissect_unknown(tvb, pinfo, tree, offset,
                                 "malformed TLV (%d vs 1,5,11,15)", length );
            return;
        }
@@ -502,23 +522,23 @@ dissect_hello_ptp_adj_clv(const u_char *pd, int offset,
  *     (they tend to be an 802.3 MAC address, but its not required).
  *
  * Input:
- *     u_char * : packet data
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : protocol display tree to fill out.  May be NULL
  *     int : offset into packet data where we are.
- *     guint : length of clv we are decoding
  *     int : length of IDs in packet.
- *     frame_data * : frame data (complete frame)
- *     proto_tree * : protocol display tree to fill out.  May be NULL
- *     gint : tree id to use for proto tree.
+ *     int : length of clv we are decoding
  * 
  * Output:
  *     void, but we will add to proto tree if !NULL.
  */
-void 
-dissect_hello_is_neighbors_clv(const u_char *pd, int offset, 
-               guint length, int id_length, frame_data *fd, proto_tree *tree ) {
+static void 
+dissect_hello_is_neighbors_clv(tvbuff_t *tvb, packet_info *pinfo,
+               proto_tree *tree, int offset, int id_length, int length)
+{
        while ( length > 0 ) {
                if (length<6) {
-                       isis_dissect_unknown(offset, length, tree, fd, 
+                       isis_dissect_unknown(tvb, pinfo, tree, offset,
                                "short is neighbor (%d vs 6)", length );
                        return;
                }
@@ -527,15 +547,14 @@ dissect_hello_is_neighbors_clv(const u_char *pd, int offset,
                 * format string.  
                 */
                if ( tree ) {
-                       proto_tree_add_text ( tree, NullTVB, offset, 6, 
-                               "IS Neighbor: %s", print_system_id( pd + offset, 6 ) ); 
+                       proto_tree_add_text ( tree, tvb, offset, 6, 
+                               "IS Neighbor: %s", print_system_id( tvb_get_ptr(tvb, offset, 6), 6 ) ); 
                }
                offset += 6;
                length -= 6;
        }
 }
 
-
 /*
  * Name: dissect_hello_padding_clv()
  *
@@ -544,22 +563,24 @@ dissect_hello_is_neighbors_clv(const u_char *pd, int offset,
  *     so we just return.
  *
  * Input:
- *     u_char * : packet data
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : proto tree to build on (may be null)
  *     int : current offset into packet data
- *     guint : length of this clv
  *     int : length of IDs in packet.
- *     frame_data * : frame data
- *     proto_tree * : proto tree to build on (may be null)
+ *     int : length of this clv
  *
  * Output:
  *     void
  */
 static void 
-dissect_hello_padding_clv(const u_char *pd, int offset, guint length, 
-               int id_length, frame_data *fd, proto_tree *tree) {
+dissect_hello_padding_clv(tvbuff_t *tvb, packet_info *pinfo,
+       proto_tree *tree, int offset, int id_length, int length)
+{
        /* nothing to do here! */
 }
 
+
 /*
  * Name: isis_dissect_isis_hello()
  * 
@@ -569,100 +590,92 @@ dissect_hello_padding_clv(const u_char *pd, int offset, guint length,
  *     a shorter header.
  *
  * Input:
+ *     tvbuff_t * : tvbuffer for packet data
+ *     packet_info * : info for current packet
+ *     proto_tree * : protocol display tree to add to.  May be NULL.
+ *     int offset : our offset into packet data.
  *     int : hello type, a la packet-isis.h ISIS_TYPE_* values
  *     int : header length of packet.
  *     int : length of IDs in packet.
- *     u_char * : packet data
- *     int offset : our offset into packet data.
- *     frame_data * : frame data
- *     proto_tree * : protocol display tree to add to.  May be NULL.
  *
  * Output:
  *     void, will modify proto_tree if not NULL.
  */    
 void 
-isis_dissect_isis_hello(int hello_type, int header_length, int id_length,
-               const u_char *pd, int offset, frame_data *fd, proto_tree *tree){
+isis_dissect_isis_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+       int offset, int hello_type, int header_length, int id_length)
+{
        proto_item      *ti;
        proto_tree      *hello_tree = NULL;
        int             len;
-       int             hlen;
+       guint8          octet;
+       const guint8    *source_id;
        guint16         pdu_length;
-
-       OLD_CHECK_DISPLAY_AS_DATA(proto_isis_hello, pd, offset, fd, tree);
-
-       if (hello_type == ISIS_TYPE_PTP_HELLO) {
-               hlen = 1+id_length+2+2+1;
-       } else {
-               hlen = 1+id_length+2+2+1+id_length+1;
-       }
-
-       if (!BYTES_ARE_IN_FRAME(offset, hlen)) {
-               isis_dissect_unknown(offset, hlen, tree, fd,
-                       "not enough capture data for header (%d vs %d)",
-                       hlen, END_OF_FRAME);
-               return;
-       }
+       const guint8    *lan_id;
 
        if (tree) {
-               ti = proto_tree_add_item(tree, proto_isis_hello, NullTVB,
-                       offset, END_OF_FRAME, FALSE);
+               ti = proto_tree_add_text(tree, tvb, offset,
+                   tvb_length_remaining(tvb, offset), "ISIS HELLO");
                hello_tree = proto_item_add_subtree(ti, ett_isis_hello);
+               octet = tvb_get_guint8(tvb, offset);
                proto_tree_add_uint_format(hello_tree,
                        hf_isis_hello_circuit_reserved,
-                       NullTVB, offset, 1, pd[offset],
+                       tvb, offset, 1, octet,
                        "Circuit type              : %s, reserved(0x%02x == 0)",
-                               val_to_str(pd[offset]&ISIS_HELLO_CTYPE_MASK,
+                               val_to_str(octet&ISIS_HELLO_CTYPE_MASK,
                                        isis_hello_circuit_type_vals,
                                        "Unknown (0x%x)"),
-                               pd[offset]&ISIS_HELLO_CT_RESERVED_MASK
+                               octet&ISIS_HELLO_CT_RESERVED_MASK
                        );
        }
        offset += 1;
 
        if (tree) {
-               proto_tree_add_bytes_format(hello_tree, hf_isis_hello_source_id, NullTVB,
-                                   offset, id_length, &pd[offset],
+               source_id = tvb_get_ptr(tvb, offset, id_length);
+               proto_tree_add_bytes_format(hello_tree, hf_isis_hello_source_id, tvb,
+                                   offset, id_length, source_id,
                                    "SystemID{ Sender of PDU } : %s", 
-                     print_system_id( pd + offset, id_length ) );
+                                   print_system_id( source_id, id_length ) );
         }
        offset += id_length;
 
        if (tree) {
-               proto_tree_add_uint(hello_tree, hf_isis_hello_holding_timer, NullTVB,
-                                   offset, 2, pntohs(&pd[offset]));
+               proto_tree_add_item(hello_tree, hf_isis_hello_holding_timer, tvb,
+                                   offset, 2, FALSE);
        }
        offset += 2;
 
-       pdu_length = pntohs(&pd[offset]);
+       pdu_length = tvb_get_ntohs(tvb, offset);
        if (tree) {
-               proto_tree_add_uint(hello_tree, hf_isis_hello_pdu_length, NullTVB,
+               proto_tree_add_uint(hello_tree, hf_isis_hello_pdu_length, tvb,
                                    offset, 2, pdu_length);
        }
        offset += 2;
 
        if (hello_type == ISIS_TYPE_PTP_HELLO) {
                if (tree) {
-                       proto_tree_add_uint(hello_tree, hf_isis_hello_local_circuit_id, NullTVB,
-                                        offset, 1, pd[offset] );
+                       proto_tree_add_item(hello_tree, hf_isis_hello_local_circuit_id, tvb,
+                                        offset, 1, FALSE );
                }
                offset += 1;
        } else { 
 
                 if (tree) {
-                        proto_tree_add_uint_format(hello_tree, hf_isis_hello_priority_reserved, NullTVB,
-                                    offset, 1, pd[offset],
+                        octet = tvb_get_guint8(tvb, offset);
+                        proto_tree_add_uint_format(hello_tree, hf_isis_hello_priority_reserved, tvb,
+                                    offset, 1, octet,
                                     "Priority                  : %d, reserved(0x%02x == 0)",
-                                        pd[offset]&ISIS_HELLO_PRIORITY_MASK,
-                                        pd[offset]&ISIS_HELLO_P_RESERVED_MASK );
+                                        octet&ISIS_HELLO_PRIORITY_MASK,
+                                        octet&ISIS_HELLO_P_RESERVED_MASK );
                 }
                 offset += 1;
 
                if (tree) {
-                       proto_tree_add_bytes_format(hello_tree, hf_isis_hello_lan_id, NullTVB, 
-                                    offset, id_length + 1, &pd[offset],
+                       lan_id = tvb_get_ptr(tvb, offset, id_length+1);
+                       proto_tree_add_bytes_format(hello_tree, hf_isis_hello_lan_id, tvb, 
+                                    offset, id_length + 1, lan_id,
                                         "SystemID{ Designated IS } : %s",
-                                             print_system_id( pd + offset, id_length + 1 ) );
+                                             print_system_id( lan_id, id_length + 1 ) );
                }
                offset += id_length + 1;
        }
@@ -670,8 +683,8 @@ isis_dissect_isis_hello(int hello_type, int header_length, int id_length,
        len = pdu_length;
        len -= header_length;
        if (len < 0) {
-               isis_dissect_unknown(offset, header_length, tree, fd, 
-                       "packet header length %d went beyond packet", 
+               isis_dissect_unknown(tvb, pinfo, tree, offset,
+                       "Packet header length %d went beyond packet", 
                        header_length );
                return;
        }
@@ -680,72 +693,73 @@ isis_dissect_isis_hello(int hello_type, int header_length, int id_length,
         * our list of valid ones!
         */
        if (hello_type == ISIS_TYPE_L1_HELLO){
-               isis_dissect_clvs ( clv_l1_hello_opts, len, id_length, pd,
-                       offset, fd, hello_tree, ett_isis_hello_clv_unknown );
+               isis_dissect_clvs(tvb, pinfo, hello_tree, offset,
+                       clv_l1_hello_opts, len, id_length,
+                       ett_isis_hello_clv_unknown);
        } else if (hello_type == ISIS_TYPE_L2_HELLO) {
-               isis_dissect_clvs ( clv_l2_hello_opts, len, id_length, pd,
-                       offset, fd, hello_tree, ett_isis_hello_clv_unknown );
+               isis_dissect_clvs(tvb, pinfo, hello_tree, offset,
+                       clv_l2_hello_opts, len, id_length,
+                       ett_isis_hello_clv_unknown);
        } else {
-               isis_dissect_clvs ( clv_ptp_hello_opts, len, id_length, pd,
-                       offset, fd, hello_tree, ett_isis_hello_clv_unknown );
+               isis_dissect_clvs(tvb, pinfo, hello_tree, offset,
+                       clv_ptp_hello_opts, len, id_length,
+                       ett_isis_hello_clv_unknown);
        }
 }
 
 /*
- * Name: proto_register_isis_hello()
+ * Name: isis_register_hello()
  *
  * Description:
  *     Register our protocol sub-sets with protocol manager.
- *     NOTE: this procedure is autolinked by the makefile process that
- *             builds register.c
  *
  * Input: 
- *     void
+ *     int : protocol index for the ISIS protocol
  *
  * Output:
  *     void
  */
 void
-proto_register_isis_hello(void) {
+isis_register_hello(int proto_isis) {
        static hf_register_info hf[] = {
                { &hf_isis_hello_circuit_reserved,
-               { "Circuit type              ", "isis_hello.circuite_type",
+               { "Circuit type              ", "isis.hello.circuit_type",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
 
                { &hf_isis_hello_source_id,
-               { "SystemID{ Sender of PDU } ", "isis_hello.source_id",
+               { "SystemID{ Sender of PDU } ", "isis.hello.source_id",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
 
                { &hf_isis_hello_holding_timer,
-               { "Holding timer             ", "isis_hello.holding_timer", 
+               { "Holding timer             ", "isis.hello.holding_timer", 
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
 
                { &hf_isis_hello_pdu_length,
-               { "PDU length                ", "isis_hello.pdu_length",
+               { "PDU length                ", "isis.hello.pdu_length",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
 
                { &hf_isis_hello_priority_reserved,
-                { "Priority                 ", "isis_hello.priority",
+                { "Priority                 ", "isis.hello.priority",
                        FT_UINT8, BASE_DEC, NULL, ISIS_HELLO_P_RESERVED_MASK, "", HFILL }},
 
                { &hf_isis_hello_lan_id,
-               { "SystemID{ Designated IS } ", "isis_hello.lan_id",
+               { "SystemID{ Designated IS } ", "isis.hello.lan_id",
                        FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL }},
 
                { &hf_isis_hello_local_circuit_id,
-               { "Local circuit ID          ", "isis_hello.local_circuit_id",
+               { "Local circuit ID          ", "isis.hello.local_circuit_id",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
 
                { &hf_isis_hello_clv_ipv4_int_addr,
-               { "IPv4 interface address    ", "isis_hello.clv_ipv4_int_addr",
+               { "IPv4 interface address    ", "isis.hello.clv_ipv4_int_addr",
                        FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }},
 
                { &hf_isis_hello_clv_ipv6_int_addr,
-               { "IPv6 interface address    ", "isis_hello.clv_ipv6_int_addr",
+               { "IPv6 interface address    ", "isis.hello.clv_ipv6_int_addr",
                        FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL }},
 
                { &hf_isis_hello_clv_ptp_adj,
-               { "point-to-point Adjacency  ", "isis_hello.clv_ptp_adj",
+               { "Point-to-point Adjacency  ", "isis.hello.clv_ptp_adj",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
 
        };
@@ -763,8 +777,6 @@ proto_register_isis_hello(void) {
                &ett_isis_hello_clv_mt
        };
 
-       proto_isis_hello = proto_register_protocol("ISIS HELLO",
-           "ISIS HELLO", "isis_hello");
-       proto_register_field_array(proto_isis_hello, hf, array_length(hf));
+       proto_register_field_array(proto_isis, hf, array_length(hf));
        proto_register_subtree_array(ett, array_length(ett));
 }