diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-08-17 03:06:20 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-08-17 03:06:20 +0000 |
| commit | f2d538a105a61ce6d2852700fc328e15ac158827 (patch) | |
| tree | 47c819007b231a5a8ebfcc7faa0c1354561366df /source3/include | |
| parent | c5e2c883c0415ca3c7e366357c8c6ba573713aa6 (diff) | |
| download | samba-f2d538a105a61ce6d2852700fc328e15ac158827.tar.gz samba-f2d538a105a61ce6d2852700fc328e15ac158827.tar.bz2 samba-f2d538a105a61ce6d2852700fc328e15ac158827.zip | |
some cleanups from the conversion of Pipes[] to a linked list. I also
removed most cases where a pnum is used and substituted a pipes_struct*.
in files.c I added a offset of 0x1000 to all file handles on the
wire. This makes it much less likely that bad parsing will give us the
wrong field.
(This used to be commit 8bc2627ff28d340db65bfa017daca2dc291d5ef7)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/local.h | 3 | ||||
| -rw-r--r-- | source3/include/ntdomain.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 18 |
3 files changed, 12 insertions, 13 deletions
diff --git a/source3/include/local.h b/source3/include/local.h index af12f83551..1db1e9d4c1 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -45,9 +45,6 @@ one time. */ #define MAX_CONNECTIONS 127 -/* this must be larger than the sum of the open files and directories */ -#define PIPE_HANDLE_OFFSET 0x7000 - /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE #define SHMEM_SIZE (1024*1024) diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h index 0b2648372b..ac411fa653 100644 --- a/source3/include/ntdomain.h +++ b/source3/include/ntdomain.h @@ -53,8 +53,10 @@ typedef struct } prs_struct; -typedef struct +typedef struct pipes_struct { + struct pipes_struct *next, *prev; + int pnum; connection_struct *conn; int uid; BOOL open; /* open connection */ diff --git a/source3/include/proto.h b/source3/include/proto.h index e52ffdcd7a..cda824c7d0 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -55,7 +55,6 @@ struct bitmap *bitmap_allocate(int n); void bitmap_free(struct bitmap *bm); BOOL bitmap_set(struct bitmap *bm, unsigned i); BOOL bitmap_clear(struct bitmap *bm, unsigned i); -BOOL bitmap_query(struct bitmap *bm, unsigned i); int bitmap_find(struct bitmap *bm, unsigned ofs); /*The following definitions come from lib/charcnv.c */ @@ -1857,16 +1856,17 @@ BOOL api_netlog_rpc(pipes_struct *p, prs_struct *data); /*The following definitions come from rpc_server/srv_pipe_hnd.c */ -void reset_chain_pnum(void); -void set_chain_pnum(int new_pnum); +void reset_chain_p(void); +void set_chain_p(pipes_struct *new_p); void init_rpc_pipe_hnd(void); -int open_rpc_pipe_hnd(char *pipe_name, connection_struct *conn, uint16 vuid); -int read_pipe(uint16 pnum, char *data, uint32 pos, int n); -BOOL get_rpc_pipe(int pnum, pipes_struct **p); -char *get_rpc_pipe_hnd_name(int pnum); +pipes_struct *open_rpc_pipe_p(char *pipe_name, + connection_struct *conn, uint16 vuid); +int read_pipe(pipes_struct *p, char *data, uint32 pos, int n); +char *get_rpc_pipe_hnd_name(pipes_struct *p); BOOL set_rpc_pipe_hnd_state(pipes_struct *p, uint16 device_state); -BOOL close_rpc_pipe_hnd(int pnum, connection_struct *conn); -int get_rpc_pipe_num(char *buf, int where); +BOOL close_rpc_pipe_hnd(pipes_struct *p, connection_struct *conn); +pipes_struct *get_rpc_pipe_p(char *buf, int where); +pipes_struct *get_rpc_pipe(int pnum); /*The following definitions come from rpc_server/srv_reg.c */ |