sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-04 09:44:20 +03:00
Code Activity

s3:libsmb: move cli_state->{src_ss,dest_ss} to cli_state->conn.{local_ss,remote_ss}

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2011-07-22 13:43:02 +02:00
parent cc4b2a6dc3
commit 48de329363
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source3/include/client.h
View File

@@ -74,8 +74,6 @@ struct cli_state {
char *share; char *share;
char *dev; char *dev;
struct sockaddr_storage src_ss;
struct sockaddr_storage dest_ss;
DATA_BLOB secblob; /* cryptkey or negTokenInit */ DATA_BLOB secblob; /* cryptkey or negTokenInit */
uint32 sesskey; uint32 sesskey;
@@ -125,6 +123,8 @@ struct cli_state {
struct { struct {
int fd; int fd;
struct sockaddr_storage local_ss;
struct sockaddr_storage remote_ss;
struct tevent_queue *outgoing; struct tevent_queue *outgoing;
struct tevent_req **pending; struct tevent_req **pending;
} conn; } conn;

12
source3/libsmb/clientgen.c
View File

@@ -245,16 +245,16 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
cli->conn.fd = fd; cli->conn.fd = fd;
ss_length = sizeof(cli->src_ss); ss_length = sizeof(cli->conn.local_ss);
ret = getsockname(fd, ret = getsockname(fd,
(struct sockaddr *)(void *)&cli->src_ss, (struct sockaddr *)(void *)&cli->conn.local_ss,
&ss_length); &ss_length);
if (ret == -1) { if (ret == -1) {
goto error; goto error;
} }
ss_length = sizeof(cli->dest_ss); ss_length = sizeof(cli->conn.remote_ss);
ret = getpeername(fd, ret = getpeername(fd,
(struct sockaddr *)(void *)&cli->dest_ss, (struct sockaddr *)(void *)&cli->conn.remote_ss,
&ss_length); &ss_length);
if (ret == -1) { if (ret == -1) {
goto error; goto error;
@@ -368,12 +368,12 @@ void cli_sockopt(struct cli_state *cli, const char *options)
const struct sockaddr_storage *cli_state_local_sockaddr(struct cli_state *cli) const struct sockaddr_storage *cli_state_local_sockaddr(struct cli_state *cli)
{ {
return &cli->src_ss; return &cli->conn.local_ss;
} }
const struct sockaddr_storage *cli_state_remote_sockaddr(struct cli_state *cli) const struct sockaddr_storage *cli_state_remote_sockaddr(struct cli_state *cli)
{ {
return &cli->dest_ss; return &cli->conn.remote_ss;
} }
uint16_t cli_state_get_vc_num(struct cli_state *cli) uint16_t cli_state_get_vc_num(struct cli_state *cli)