diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-10 17:03:28 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-10 17:03:28 +0000 |
| commit | 5a7cc4836bb5bc78ff12b7063c8578e024263a26 (patch) | |
| tree | 961a9c6e70cd947bfa49471022a7ecde8c400fa5 /epan | |
| parent | 5518639af2f49849514e571843e892477da846a0 (diff) | |
Move #defines from packet-hclnfsd.h into the dissector since there is no external need for the values.
svn path=/trunk/; revision=53234
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-hclnfsd.c | 22 | ||||
| -rw-r--r-- | epan/dissectors/packet-hclnfsd.h | 48 |
3 files changed, 21 insertions, 50 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 2b305a6095..a776be1514 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -1403,7 +1403,6 @@ DISSECTOR_INCLUDES = \ packet-h264.h \ packet-h323.h \ packet-h450-ros.h \ - packet-hclnfsd.h \ packet-hdcp.h \ packet-hpext.h \ packet-http.h \ diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index 865322a40c..ef40d663cf 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -31,10 +31,30 @@ #include "packet-rpc.h" #include "packet-nfs.h" -#include "packet-hclnfsd.h" #include <epan/wmem/wmem.h> +#define HCLNFSD_PROGRAM 0x2f00dbad + +#define HCLNFSDPROC_NULL 0 +#define HCLNFSDPROC_SPOOL_INQUIRE 1 +#define HCLNFSDPROC_SPOOL_FILE 2 +#define HCLNFSDPROC_AUTHORIZE 3 +#define HCLNFSDPROC_GRP_NAME_TO_NUMB 4 +#define HCLNFSDPROC_GRP_TO_NUMBER 5 +#define HCLNFSDPROC_RETURN_HOST 6 +#define HCLNFSDPROC_UID_TO_NAME 7 +#define HCLNFSDPROC_NAME_TO_UID 8 +#define HCLNFSDPROC_SHARE 20 +#define HCLNFSDPROC_UNSHARE 21 +#define HCLNFSDPROC_LOCK 22 +#define HCLNFSDPROC_REMOVE 23 +#define HCLNFSDPROC_UNLOCK 24 +#define HCLNFSDPROC_GET_PRINTERS 30 +#define HCLNFSDPROC_GET_PRINTQ 31 +#define HCLNFSDPROC_CANCEL_PRJOB 32 +#define HCLNFSDPROC_ZAP_LOCKS 105 + static int proto_hclnfsd = -1; static int hf_hclnfsd_procedure_v1 = -1; static int hf_hclnfsd_request_type = -1; diff --git a/epan/dissectors/packet-hclnfsd.h b/epan/dissectors/packet-hclnfsd.h deleted file mode 100644 index 47becb19e1..0000000000 --- a/epan/dissectors/packet-hclnfsd.h +++ /dev/null @@ -1,48 +0,0 @@ -/* packet-hclnfsd.h - * - * $Id$ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef PACKET_HCLNFSD_H -#define PACKET_HCLNFSD_H - -#define HCLNFSD_PROGRAM 0x2f00dbad - -#define HCLNFSDPROC_NULL 0 -#define HCLNFSDPROC_SPOOL_INQUIRE 1 -#define HCLNFSDPROC_SPOOL_FILE 2 -#define HCLNFSDPROC_AUTHORIZE 3 -#define HCLNFSDPROC_GRP_NAME_TO_NUMB 4 -#define HCLNFSDPROC_GRP_TO_NUMBER 5 -#define HCLNFSDPROC_RETURN_HOST 6 -#define HCLNFSDPROC_UID_TO_NAME 7 -#define HCLNFSDPROC_NAME_TO_UID 8 -#define HCLNFSDPROC_SHARE 20 -#define HCLNFSDPROC_UNSHARE 21 -#define HCLNFSDPROC_LOCK 22 -#define HCLNFSDPROC_REMOVE 23 -#define HCLNFSDPROC_UNLOCK 24 -#define HCLNFSDPROC_GET_PRINTERS 30 -#define HCLNFSDPROC_GET_PRINTQ 31 -#define HCLNFSDPROC_CANCEL_PRJOB 32 -#define HCLNFSDPROC_ZAP_LOCKS 105 - -#endif |