From f88bf54c7f6d1c2ef833047eb8327953c304b5ff Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 25 May 2004 17:24:24 +0000 Subject: r889: convert samba4 to use [u]int16_t instead of [u]int16 metze (This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3) --- source4/smb_server/conn.c | 2 +- source4/smb_server/negprot.c | 14 +++++------ source4/smb_server/nttrans.c | 20 +++++++-------- source4/smb_server/password.c | 4 +-- source4/smb_server/reply.c | 16 ++++++------ source4/smb_server/request.c | 6 ++--- source4/smb_server/search.c | 6 ++--- source4/smb_server/service.c | 2 +- source4/smb_server/signing.c | 2 +- source4/smb_server/smb_server.c | 14 +++++------ source4/smb_server/trans2.c | 54 ++++++++++++++++++++--------------------- 11 files changed, 70 insertions(+), 70 deletions(-) (limited to 'source4/smb_server') diff --git a/source4/smb_server/conn.c b/source4/smb_server/conn.c index f8cb145cd8..821981a1c8 100644 --- a/source4/smb_server/conn.c +++ b/source4/smb_server/conn.c @@ -126,7 +126,7 @@ void conn_close_all(struct server_context *smb) /**************************************************************************** clear a vuid out of the validity cache, and as the 'owner' of a connection. ****************************************************************************/ -void conn_clear_vuid_cache(struct server_context *smb, uint16 vuid) +void conn_clear_vuid_cache(struct server_context *smb, uint16_t vuid) { struct tcon_context *conn; unsigned int i; diff --git a/source4/smb_server/negprot.c b/source4/smb_server/negprot.c index 43dc5094df..42e706a816 100644 --- a/source4/smb_server/negprot.c +++ b/source4/smb_server/negprot.c @@ -49,7 +49,7 @@ static void get_challenge(struct server_context *smb, char buff[8]) /**************************************************************************** Reply for the core protocol. ****************************************************************************/ -static void reply_corep(struct request_context *req, uint16 choice) +static void reply_corep(struct request_context *req, uint16_t choice) { req_setup_reply(req, 1, 0); @@ -65,9 +65,9 @@ static void reply_corep(struct request_context *req, uint16 choice) this is quite incomplete - we only fill in a small part of the reply, but as nobody uses this any more it probably doesn't matter ****************************************************************************/ -static void reply_coreplus(struct request_context *req, uint16 choice) +static void reply_coreplus(struct request_context *req, uint16_t choice) { - uint16 raw = (lp_readraw()?1:0) | (lp_writeraw()?2:0); + uint16_t raw = (lp_readraw()?1:0) | (lp_writeraw()?2:0); req_setup_reply(req, 13, 0); @@ -90,7 +90,7 @@ static void reply_coreplus(struct request_context *req, uint16 choice) /**************************************************************************** Reply for the lanman 1.0 protocol. ****************************************************************************/ -static void reply_lanman1(struct request_context *req, uint16 choice) +static void reply_lanman1(struct request_context *req, uint16_t choice) { int raw = (lp_readraw()?1:0) | (lp_writeraw()?2:0); int secword=0; @@ -134,7 +134,7 @@ static void reply_lanman1(struct request_context *req, uint16 choice) /**************************************************************************** Reply for the lanman 2.0 protocol. ****************************************************************************/ -static void reply_lanman2(struct request_context *req, uint16 choice) +static void reply_lanman2(struct request_context *req, uint16_t choice) { int raw = (lp_readraw()?1:0) | (lp_writeraw()?2:0); int secword=0; @@ -223,7 +223,7 @@ static DATA_BLOB negprot_spnego(struct server_context *smb) /**************************************************************************** Reply for the nt protocol. ****************************************************************************/ -static void reply_nt1(struct request_context *req, uint16 choice) +static void reply_nt1(struct request_context *req, uint16_t choice) { /* dual names + lock_and_read + nt SMBs + remote API calls */ int capabilities; @@ -422,7 +422,7 @@ protocol [LANMAN2.1] static const struct { const char *proto_name; const char *short_name; - void (*proto_reply_fn)(struct request_context *req, uint16 choice); + void (*proto_reply_fn)(struct request_context *req, uint16_t choice); int protocol_level; } supported_protocols[] = { {"NT LANMAN 1.0", "NT1", reply_nt1, PROTOCOL_NT1}, diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c index 2847efcef5..299d5b7333 100644 --- a/source4/smb_server/nttrans.c +++ b/source4/smb_server/nttrans.c @@ -34,12 +34,12 @@ /* setup a nttrans reply, given the data and params sizes */ static void nttrans_setup_reply(struct request_context *req, struct smb_nttrans *trans, - uint16 param_size, uint16 data_size, - uint16 setup_count) + uint16_t param_size, uint16_t data_size, + uint16_t setup_count) { trans->out.setup_count = setup_count; if (setup_count != 0) { - trans->out.setup = talloc_zero(req->mem_ctx, sizeof(uint16) * setup_count); + trans->out.setup = talloc_zero(req->mem_ctx, sizeof(uint16_t) * setup_count); } trans->out.params = data_blob_talloc(req->mem_ctx, NULL, param_size); trans->out.data = data_blob_talloc(req->mem_ctx, NULL, data_size); @@ -68,7 +68,7 @@ static NTSTATUS nttrans_ioctl(struct request_context *req, { union smb_ioctl nt; uint32_t function; - uint16 fnum; + uint16_t fnum; uint8 filter; BOOL fsctl; DATA_BLOB *blob; @@ -132,10 +132,10 @@ void reply_nttrans(struct request_context *req) { struct smb_nttrans trans; int i; - uint16 param_ofs, data_ofs; - uint16 param_count, data_count; - uint16 params_left, data_left; - uint16 param_total, data_total; + uint16_t param_ofs, data_ofs; + uint16_t param_count, data_count; + uint16_t params_left, data_left; + uint16_t param_total, data_total; char *params, *data; NTSTATUS status; @@ -163,7 +163,7 @@ void reply_nttrans(struct request_context *req) } /* parse out the setup words */ - trans.in.setup = talloc(req->mem_ctx, trans.in.setup_count * sizeof(uint16)); + trans.in.setup = talloc(req->mem_ctx, trans.in.setup_count * sizeof(uint16_t)); if (!trans.in.setup) { req_reply_error(req, NT_STATUS_NO_MEMORY); return; @@ -203,7 +203,7 @@ void reply_nttrans(struct request_context *req) /* we need to divide up the reply into chunks that fit into the negotiated buffer size */ do { - uint16 this_data, this_param, max_bytes; + uint16_t this_data, this_param, max_bytes; uint_t align1 = 1, align2 = (params_left ? 2 : 0); req_setup_reply(req, 18 + trans.out.setup_count, 0); diff --git a/source4/smb_server/password.c b/source4/smb_server/password.c index 5f7431f623..8b6018575b 100644 --- a/source4/smb_server/password.c +++ b/source4/smb_server/password.c @@ -26,7 +26,7 @@ check if a uid has been validated, and return an pointer to the user_struct if it has. NULL if not. vuid is biased by an offset. This allows us to tell random client vuid's (normally zero) from valid vuids. ****************************************************************************/ -struct user_struct *get_valid_user_struct(struct server_context *smb, uint16 vuid) +struct user_struct *get_valid_user_struct(struct server_context *smb, uint16_t vuid) { user_struct *usp; int count=0; @@ -49,7 +49,7 @@ struct user_struct *get_valid_user_struct(struct server_context *smb, uint16 vui /**************************************************************************** invalidate a uid ****************************************************************************/ -void invalidate_vuid(struct server_context *smb, uint16 vuid) +void invalidate_vuid(struct server_context *smb, uint16_t vuid) { user_struct *vuser = get_valid_user_struct(smb, vuid); diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c index 5680618bd3..9a4cee2a66 100644 --- a/source4/smb_server/reply.c +++ b/source4/smb_server/reply.c @@ -125,7 +125,7 @@ void reply_tcon_and_X(struct request_context *req) NTSTATUS status; union smb_tcon con; char *p; - uint16 passlen; + uint16_t passlen; con.tconx.level = RAW_TCON_TCONX; @@ -1065,7 +1065,7 @@ void reply_write_and_X(struct request_context *req) if (req->in.wct == 14) { uint32_t offset_high = IVAL(req->in.vwv, VWV(12)); - uint16 count_high = SVAL(req->in.vwv, VWV(9)); + uint16_t count_high = SVAL(req->in.vwv, VWV(9)); io->writex.in.offset |= (((uint64_t)offset_high) << 32); io->writex.in.count |= ((uint32_t)count_high) << 16; } @@ -1321,7 +1321,7 @@ void reply_tdis(struct request_context *req) ****************************************************************************/ void reply_echo(struct request_context *req) { - uint16 count; + uint16_t count; int i; REQ_CHECK_WCT(req, 0); @@ -1894,7 +1894,7 @@ static void reply_sesssetup_old(struct request_context *req) NTSTATUS status; union smb_sesssetup sess; char *p; - uint16 passlen; + uint16_t passlen; sess.old.level = RAW_SESSSETUP_OLD; @@ -1952,7 +1952,7 @@ static void reply_sesssetup_nt1(struct request_context *req) NTSTATUS status; union smb_sesssetup sess; char *p; - uint16 passlen1, passlen2; + uint16_t passlen1, passlen2; sess.nt1.level = RAW_SESSSETUP_NT1; @@ -2022,7 +2022,7 @@ static void reply_sesssetup_spnego(struct request_context *req) NTSTATUS status; union smb_sesssetup sess; char *p; - uint16 blob_len; + uint16_t blob_len; sess.spnego.level = RAW_SESSSETUP_SPNEGO; @@ -2101,7 +2101,7 @@ void reply_sesssetup(struct request_context *req) ****************************************************************************/ void reply_ulogoffX(struct request_context *req) { - uint16 vuid; + uint16_t vuid; vuid = SVAL(req->in.hdr, HDR_UID); @@ -2199,7 +2199,7 @@ static void reply_ntcreate_and_X_send(struct request_context *req) void reply_ntcreate_and_X(struct request_context *req) { union smb_open *io; - uint16 fname_len; + uint16_t fname_len; /* parse the request */ REQ_CHECK_WCT(req, 24); diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c index 068e43cd09..558d140600 100644 --- a/source4/smb_server/request.c +++ b/source4/smb_server/request.c @@ -292,7 +292,7 @@ void req_send_reply(struct request_context *req) construct and send an error packet with a forced DOS error code this is needed to match win2000 behaviour for some parts of the protocol */ -void req_reply_dos_error(struct request_context *req, uint8 eclass, uint16 ecode) +void req_reply_dos_error(struct request_context *req, uint8 eclass, uint16_t ecode) { /* if the basic packet hasn't been setup yet then do it now */ if (req->out.buffer == NULL) { @@ -407,7 +407,7 @@ size_t req_append_bytes(struct request_context *req, return the number of bytes added */ size_t req_append_var_block(struct request_context *req, - const uint8 *bytes, uint16 byte_len) + const uint8 *bytes, uint16_t byte_len) { req_grow_allocation(req, byte_len + 3 + req->out.data_size); SCVAL(req->out.data + req->out.data_size, 0, 5); @@ -617,7 +617,7 @@ BOOL req_data_oob(struct request_context *req, const char *ptr, uint32_t count) /* pull an open file handle from a packet, taking account of the chained_fnum */ -uint16 req_fnum(struct request_context *req, const char *base, unsigned offset) +uint16_t req_fnum(struct request_context *req, const char *base, unsigned offset) { if (req->chained_fnum != -1) { return req->chained_fnum; diff --git a/source4/smb_server/search.c b/source4/smb_server/search.c index 55d1ae7c33..ae83a2b4a0 100644 --- a/source4/smb_server/search.c +++ b/source4/smb_server/search.c @@ -59,7 +59,7 @@ struct search_state { struct request_context *req; union smb_search_data *file; - uint16 last_entry_offset; + uint16_t last_entry_offset; }; /* @@ -105,7 +105,7 @@ void reply_search(struct request_context *req) union smb_search_first *sf; union smb_search_next *sn; DATA_BLOB resume_key; - uint16 resume_key_length; + uint16_t resume_key_length; struct search_state state; char *p; @@ -194,7 +194,7 @@ void reply_fclose(struct request_context *req) { union smb_search_next *sn; DATA_BLOB resume_key; - uint16 resume_key_length; + uint16_t resume_key_length; REQ_TALLOC(sn, sizeof(*sn)); diff --git a/source4/smb_server/service.c b/source4/smb_server/service.c index 86c42a2ee6..74e8746b0f 100644 --- a/source4/smb_server/service.c +++ b/source4/smb_server/service.c @@ -210,7 +210,7 @@ static NTSTATUS make_connection_snum(struct request_context *req, ****************************************************************************/ static NTSTATUS make_connection(struct request_context *req, const char *service, DATA_BLOB password, - const char *dev, uint16 vuid) + const char *dev, uint16_t vuid) { int snum; enum ntvfs_type type; diff --git a/source4/smb_server/signing.c b/source4/smb_server/signing.c index a3779e17cf..1440026291 100644 --- a/source4/smb_server/signing.c +++ b/source4/smb_server/signing.c @@ -25,7 +25,7 @@ */ static void mark_packet_signed(struct request_context *req) { - uint16 flags2; + uint16_t flags2; flags2 = SVAL(req->out.hdr, HDR_FLG2); flags2 |= FLAGS2_SMB_SECURITY_SIGNATURES; SSVAL(req->out.hdr, HDR_FLG2, flags2); diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ce50df04c3..9d971383b5 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -25,7 +25,7 @@ /* send an oplock break request to a client */ -BOOL req_send_oplock_break(struct tcon_context *conn, uint16 fnum, uint8 level) +BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8 level) { struct request_context *req; @@ -436,7 +436,7 @@ onto the message queue static void switch_message(int type, struct request_context *req) { int flags; - uint16 session_tag; + uint16_t session_tag; struct server_context *smb = req->smb; type &= 0xff; @@ -598,10 +598,10 @@ static void construct_reply(struct request_context *req) */ void chain_reply(struct request_context *req) { - uint16 chain_cmd, chain_offset; + uint16_t chain_cmd, chain_offset; char *vwv, *data; - uint16 wct; - uint16 data_size; + uint16_t wct; + uint16_t data_size; if (req->in.wct < 2 || req->out.wct < 2) { req_reply_dos_error(req, ERRSRV, ERRerror); @@ -682,7 +682,7 @@ void server_terminate(struct server_context *smb) called when a SMB socket becomes readable */ void smbd_read_handler(struct event_context *ev, struct fd_event *fde, - time_t t, uint16 flags) + time_t t, uint16_t flags) { struct request_context *req; struct server_context *smb = fde->private; @@ -725,7 +725,7 @@ void smbd_process_async(struct server_context *smb) for reading from that socket */ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int fd, - void (*read_handler)(struct event_context *, struct fd_event *, time_t, uint16)) + void (*read_handler)(struct event_context *, struct fd_event *, time_t, uint16_t)) { struct server_context *smb; TALLOC_CTX *mem_ctx; diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c index 46ab112374..e416b63bd4 100644 --- a/source4/smb_server/trans2.c +++ b/source4/smb_server/trans2.c @@ -34,7 +34,7 @@ pointer */ static void trans2_grow_data_allocation(struct request_context *req, struct smb_trans2 *trans, - uint16 new_size) + uint16_t new_size) { if (new_size <= trans->out.data.length) { return; @@ -46,7 +46,7 @@ static void trans2_grow_data_allocation(struct request_context *req, /* grow the data size of a trans2 reply */ static void trans2_grow_data(struct request_context *req, struct smb_trans2 *trans, - uint16 new_size) + uint16_t new_size) { trans2_grow_data_allocation(req, trans, new_size); trans->out.data.length = new_size; @@ -55,9 +55,9 @@ static void trans2_grow_data(struct request_context *req, /* grow the data, zero filling any new bytes */ static void trans2_grow_data_fill(struct request_context *req, struct smb_trans2 *trans, - uint16 new_size) + uint16_t new_size) { - uint16 old_size = trans->out.data.length; + uint16_t old_size = trans->out.data.length; trans2_grow_data(req, trans, new_size); if (new_size > old_size) { memset(trans->out.data.data + old_size, 0, new_size - old_size); @@ -68,12 +68,12 @@ static void trans2_grow_data_fill(struct request_context *req, /* setup a trans2 reply, given the data and params sizes */ static void trans2_setup_reply(struct request_context *req, struct smb_trans2 *trans, - uint16 param_size, uint16 data_size, - uint16 setup_count) + uint16_t param_size, uint16_t data_size, + uint16_t setup_count) { trans->out.setup_count = setup_count; if (setup_count != 0) { - trans->out.setup = talloc_zero(req->mem_ctx, sizeof(uint16) * setup_count); + trans->out.setup = talloc_zero(req->mem_ctx, sizeof(uint16_t) * setup_count); } trans->out.params = data_blob_talloc(req->mem_ctx, NULL, param_size); trans->out.data = data_blob_talloc(req->mem_ctx, NULL, data_size); @@ -85,7 +85,7 @@ static void trans2_setup_reply(struct request_context *req, */ static size_t trans2_pull_blob_string(struct request_context *req, const DATA_BLOB *blob, - uint16 offset, + uint16_t offset, const char **str, int flags) { @@ -109,8 +109,8 @@ static size_t trans2_pull_blob_string(struct request_context *req, */ static size_t trans2_push_data_string(struct request_context *req, struct smb_trans2 *trans, - uint16 len_offset, - uint16 offset, + uint16_t len_offset, + uint16_t offset, const WIRE_STRING *str, int dest_len, int flags) @@ -183,7 +183,7 @@ static void trans2_append_data_string(struct request_context *req, int flags) { size_t ret; - uint16 offset; + uint16_t offset; const int max_bytes_per_char = 3; offset = trans->out.data.length; @@ -200,7 +200,7 @@ static NTSTATUS trans2_qfsinfo(struct request_context *req, struct smb_trans2 *t { union smb_fsinfo fsinfo; NTSTATUS status; - uint16 level; + uint16_t level; uint_t i; DATA_BLOB guid_blob; @@ -587,7 +587,7 @@ static NTSTATUS trans2_fileinfo_fill(struct request_context *req, struct smb_tra SSVAL(trans->out.params.data, 0, 0); for (i=0;istream_info.out.num_streams;i++) { - uint16 data_size = trans->out.data.length; + uint16_t data_size = trans->out.data.length; char *data; trans2_grow_data(req, trans, data_size + 24); @@ -618,7 +618,7 @@ static NTSTATUS trans2_qpathinfo(struct request_context *req, struct smb_trans2 { union smb_fileinfo st; NTSTATUS status; - uint16 level; + uint16_t level; /* make sure we got enough parameters */ if (trans->in.params.length < 8) { @@ -658,7 +658,7 @@ static NTSTATUS trans2_qfileinfo(struct request_context *req, struct smb_trans2 { union smb_fileinfo st; NTSTATUS status; - uint16 level; + uint16_t level; /* make sure we got enough parameters */ if (trans->in.params.length < 4) { @@ -790,7 +790,7 @@ static NTSTATUS trans2_setfileinfo(struct request_context *req, struct smb_trans { union smb_setfileinfo st; NTSTATUS status; - uint16 level, fnum; + uint16_t level, fnum; DATA_BLOB *blob; /* make sure we got enough parameters */ @@ -828,7 +828,7 @@ static NTSTATUS trans2_setpathinfo(struct request_context *req, struct smb_trans { union smb_setfileinfo st; NTSTATUS status; - uint16 level; + uint16_t level; DATA_BLOB *blob; /* make sure we got enough parameters */ @@ -866,8 +866,8 @@ struct find_state { struct request_context *req; struct smb_trans2 *trans; enum search_level level; - uint16 last_entry_offset; - uint16 flags; + uint16_t last_entry_offset; + uint16_t flags; }; /* @@ -1073,7 +1073,7 @@ static NTSTATUS trans2_findfirst(struct request_context *req, struct smb_trans2 { union smb_search_first search; NTSTATUS status; - uint16 level; + uint16_t level; char *param; struct find_state state; @@ -1133,7 +1133,7 @@ static NTSTATUS trans2_findnext(struct request_context *req, struct smb_trans2 * { union smb_search_next search; NTSTATUS status; - uint16 level; + uint16_t level; char *param; struct find_state state; @@ -1242,10 +1242,10 @@ void reply_trans_generic(struct request_context *req, uint8 command) { struct smb_trans2 trans; int i; - uint16 param_ofs, data_ofs; - uint16 param_count, data_count; - uint16 params_left, data_left; - uint16 param_total, data_total; + uint16_t param_ofs, data_ofs; + uint16_t param_count, data_count; + uint16_t params_left, data_left; + uint16_t param_total, data_total; char *params, *data; NTSTATUS status; @@ -1274,7 +1274,7 @@ void reply_trans_generic(struct request_context *req, uint8 command) } /* parse out the setup words */ - trans.in.setup = talloc(req->mem_ctx, trans.in.setup_count * sizeof(uint16)); + trans.in.setup = talloc(req->mem_ctx, trans.in.setup_count * sizeof(uint16_t)); if (!trans.in.setup) { req_reply_error(req, NT_STATUS_NO_MEMORY); return; @@ -1322,7 +1322,7 @@ void reply_trans_generic(struct request_context *req, uint8 command) /* we need to divide up the reply into chunks that fit into the negotiated buffer size */ do { - uint16 this_data, this_param, max_bytes; + uint16_t this_data, this_param, max_bytes; uint_t align1 = 1, align2 = (params_left ? 2 : 0); req_setup_reply(req, 10 + trans.out.setup_count, 0); -- cgit