projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: portability fixups
[fio.git]
/
server.c
diff --git
a/server.c
b/server.c
index dd0aeb3cb8d320e18a3ac6d3a7e4b1ac24f60796..37ba5939b32c0b17371079261220f474eb53c02f 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-399,8
+399,8
@@
void fio_server_idle_loop(void)
static int accept_loop(int listen_sk)
{
static int accept_loop(int listen_sk)
{
- struct sockaddr addr;
-
unsigned in
t len = sizeof(addr);
+ struct sockaddr
_in
addr;
+
socklen_
t len = sizeof(addr);
struct pollfd pfd;
int ret, sk, flags, exitval = 0;
struct pollfd pfd;
int ret, sk, flags, exitval = 0;
@@
-429,13
+429,13
@@
again:
if (exit_backend)
goto out;
if (exit_backend)
goto out;
- sk = accept(listen_sk, &addr, &len);
+ sk = accept(listen_sk,
(struct sockaddr *)
&addr, &len);
if (sk < 0) {
log_err("fio: accept: %s\n", strerror(errno));
return -1;
}
if (sk < 0) {
log_err("fio: accept: %s\n", strerror(errno));
return -1;
}
- dprint(FD_NET, "server
got a connection\n"
);
+ dprint(FD_NET, "server
: connect from %s\n", inet_ntoa(addr.sin_addr)
);
server_fd = sk;
server_fd = sk;
@@
-456,7
+456,7
@@
int fio_server_text_output(const char *buf, unsigned int len)
if (server_fd != -1)
return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len);
if (server_fd != -1)
return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len);
- return
0
;
+ return
fwrite(buf, len, 1, f_err)
;
}
static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
}
static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
@@
-631,7
+631,7
@@
static int fio_server(void)
{
struct sockaddr_in saddr_in;
struct sockaddr addr;
{
struct sockaddr_in saddr_in;
struct sockaddr addr;
-
unsigned in
t len;
+
socklen_
t len;
int sk, opt, ret;
dprint(FD_NET, "starting server\n");
int sk, opt, ret;
dprint(FD_NET, "starting server\n");