sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

librpc/rpc: move enum dcerpc_transport_t to rpc_common.h

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2011-03-13 14:05:19 +01:00
parent b0d54da746
commit 83c55ac67e
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
librpc/rpc/rpc_common.h
View File

@ -29,9 +29,15 @@ struct ndr_interface_call;
struct ndr_push;
struct ndr_pull;
struct ncacn_packet;
struct epm_floor;
struct tevent_context;
struct tstream_context;
enum dcerpc_transport_t {
NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC,
NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM,
NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX, NCACN_INTERNAL };
/* The following definitions come from ../librpc/rpc/dcerpc_error.c */
const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);

15
source3/librpc/rpc/dcerpc.h
View File

@ -23,16 +23,13 @@
* If you remove any functions or change their signature, update
* the so version number. */
#ifndef __DCERPC_H__
#define __DCERPC_H__
#ifndef _S3_DCERPC_H__
#define _S3_DCERPC_H__
#include "../librpc/rpc/rpc_common.h"
#define SMB_RPC_INTERFACE_VERSION 1
enum dcerpc_transport_t {
NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC,
NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM,
NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX, NCACN_INTERNAL };
/** this describes a binding to a particular transport/pipe */
struct dcerpc_binding {
enum dcerpc_transport_t transport;
@ -162,6 +159,4 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
DATA_BLOB *raw_pkt,
size_t *pad_len);
#include "../librpc/rpc/rpc_common.h"
#endif /* __DCERPC_H__ */
#endif /* __S3_DCERPC_H__ */

14
source4/librpc/rpc/dcerpc.h
View File

@ -24,23 +24,19 @@
* If you remove any functions or change their signature, update
* the so version number. */
#ifndef __DCERPC_H__
#define __DCERPC_H__
#ifndef __S4_DCERPC_H__
#define __S4_DCERPC_H__
#include "../lib/util/data_blob.h"
#include "librpc/gen_ndr/dcerpc.h"
#include "../librpc/ndr/libndr.h"
#include "../librpc/rpc/rpc_common.h"
struct tevent_context;
struct tevent_req;
struct dcerpc_binding_handle;
struct tstream_context;
enum dcerpc_transport_t {
NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC,
NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM,
NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX, NCACN_INTERNAL };
/*
this defines a generic security context for signed/sealed dcerpc pipes.
*/
@ -383,6 +379,4 @@ enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
#include "../librpc/rpc/rpc_common.h"
#endif /* __DCERPC_H__ */
#endif /* __S4_DCERPC_H__ */