Rename samr_dissect_LOGON_HOURS() to dissect_ndr_nt_LOGON_HOURS() and
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 11 Mar 2002 00:00:15 +0000 (00:00 +0000)
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 11 Mar 2002 00:00:15 +0000 (00:00 +0000)
export it to other modules.
NETLOGON dissector (and others) will need this function.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4919 f5534014-38df-0310-8fa8-9805f1628bb7

packet-dcerpc-nt.h
packet-dcerpc-samr.c

index 88c3dbeabf20bc516502d86ef05bf69542bcbd63..e25445a4ea53d7238ce086aeb4b0d91c81641acf 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for DCERPC over SMB packet disassembly
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *
  * Routines for DCERPC over SMB packet disassembly
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-nt.h,v 1.8 2002/03/10 23:24:48 sahlberg Exp $
+ * $Id: packet-dcerpc-nt.h,v 1.9 2002/03/11 00:00:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -91,5 +91,10 @@ int
 dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, 
                        packet_info *pinfo, proto_tree *tree, 
                        char *drep, int hf_index);
 dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, 
                        packet_info *pinfo, proto_tree *tree, 
                        char *drep, int hf_index);
+int
+dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, 
+                       packet_info *pinfo, proto_tree *parent_tree,
+                       char *drep);
+
 
 #endif /* packet-dcerpc-nt.h */
 
 #endif /* packet-dcerpc-nt.h */
index e789acd05acccd111ec81a9a814039744759f227..405a5e97d6a434ba9d80e8f0ccd1739e1077a61e 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *   2002 Added all command dissectors  Ronnie Sahlberg
  *
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *   2002 Added all command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-samr.c,v 1.21 2002/03/10 23:24:48 sahlberg Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.22 2002/03/11 00:00:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2355,8 +2355,8 @@ samr_dissect_LOGON_HOURS_hours(tvbuff_t *tvb, int offset,
        return offset;
 }
 
        return offset;
 }
 
-static int
-samr_dissect_LOGON_HOURS(tvbuff_t *tvb, int offset, 
+int
+dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, 
                        packet_info *pinfo, proto_tree *parent_tree,
                        char *drep)
 {
                        packet_info *pinfo, proto_tree *parent_tree,
                        char *drep)
 {
@@ -2486,7 +2486,7 @@ samr_dissect_USER_INFO_3(tvbuff_t *tvb, int offset,
                                hf_samr_pwd_can_change_time);
        offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep,
                                hf_samr_pwd_must_change_time);
                                hf_samr_pwd_can_change_time);
        offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep,
                                hf_samr_pwd_must_change_time);
-       offset = samr_dissect_LOGON_HOURS(tvb, offset, pinfo, tree, drep);
+       offset = dissect_ndr_nt_LOGON_HOURS(tvb, offset, pinfo, tree, drep);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
                                hf_samr_logon_count, NULL);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
                                hf_samr_logon_count, NULL);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
@@ -2538,7 +2538,7 @@ samr_dissect_USER_INFO_5(tvbuff_t *tvb, int offset,
                                hf_samr_logon_time);
        offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep,
                                hf_samr_logoff_time);
                                hf_samr_logon_time);
        offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep,
                                hf_samr_logoff_time);
-       offset = samr_dissect_LOGON_HOURS(tvb, offset, pinfo, tree, drep);
+       offset = dissect_ndr_nt_LOGON_HOURS(tvb, offset, pinfo, tree, drep);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
                                hf_samr_bad_pwd_count, NULL);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
                                hf_samr_bad_pwd_count, NULL);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
@@ -2765,7 +2765,7 @@ samr_dissect_USER_INFO_21(tvbuff_t *tvb, int offset,
        offset = dissect_ndr_nt_acct_ctrl(tvb, offset, pinfo, tree, drep);
        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
                                hf_samr_unknown_long, NULL);
        offset = dissect_ndr_nt_acct_ctrl(tvb, offset, pinfo, tree, drep);
        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
                                hf_samr_unknown_long, NULL);
-       offset = samr_dissect_LOGON_HOURS(tvb, offset, pinfo, tree, drep);
+       offset = dissect_ndr_nt_LOGON_HOURS(tvb, offset, pinfo, tree, drep);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
                                hf_samr_bad_pwd_count, NULL);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
                                hf_samr_bad_pwd_count, NULL);
        offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
@@ -2887,7 +2887,7 @@ samr_dissect_USER_INFO (tvbuff_t *tvb, int offset,
                                tvb, offset, pinfo, tree, drep);
                break;
        case 4: 
                                tvb, offset, pinfo, tree, drep);
                break;
        case 4: 
-               offset = samr_dissect_LOGON_HOURS(
+               offset = dissect_ndr_nt_LOGON_HOURS(
                                tvb, offset, pinfo, tree, drep);
                break;
        case 5: 
                                tvb, offset, pinfo, tree, drep);
                break;
        case 5: