rename TIP_CLIENT_RECEIVING_* states to TIP_CLIENT_GET_*
parent
486e1b8351
commit
85ff3e5d57
14
src/main.c
14
src/main.c
|
@ -40,8 +40,8 @@ static const char *addr;
|
||||||
struct ev_loop *tip_main_loop;
|
struct ev_loop *tip_main_loop;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
TIP_CLIENT_RECEIVING_HEADER,
|
TIP_CLIENT_GET_HEADER,
|
||||||
TIP_CLIENT_RECEIVING_PAYLOAD,
|
TIP_CLIENT_GET_PAYLOAD,
|
||||||
TIP_CLIENT_NOTIFY_REDIRECT,
|
TIP_CLIENT_NOTIFY_REDIRECT,
|
||||||
TIP_CLIENT_DONE,
|
TIP_CLIENT_DONE,
|
||||||
};
|
};
|
||||||
|
@ -160,7 +160,7 @@ static int tip_client_state_recv_hdr(struct tip_client *cli)
|
||||||
cli->redirected = true;
|
cli->redirected = true;
|
||||||
tip_client_close(cli);
|
tip_client_close(cli);
|
||||||
tip_client_connect(redirect_addr);
|
tip_client_connect(redirect_addr);
|
||||||
cli->state = TIP_CLIENT_RECEIVING_HEADER;
|
cli->state = TIP_CLIENT_GET_HEADER;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -297,16 +297,16 @@ static void tip_client_read_cb(struct ev_loop *loop, struct ev_io *io, int event
|
||||||
cli->buf_len += ret;
|
cli->buf_len += ret;
|
||||||
|
|
||||||
switch (cli->state) {
|
switch (cli->state) {
|
||||||
case TIP_CLIENT_RECEIVING_HEADER:
|
case TIP_CLIENT_GET_HEADER:
|
||||||
ret = tip_client_state_recv_hdr(cli);
|
ret = tip_client_state_recv_hdr(cli);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto error;
|
goto error;
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
cli->state = TIP_CLIENT_RECEIVING_PAYLOAD;
|
cli->state = TIP_CLIENT_GET_PAYLOAD;
|
||||||
/* Fall through. */
|
/* Fall through. */
|
||||||
case TIP_CLIENT_RECEIVING_PAYLOAD:
|
case TIP_CLIENT_GET_PAYLOAD:
|
||||||
ret = tip_client_state_recv_payload(cli);
|
ret = tip_client_state_recv_payload(cli);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -479,7 +479,7 @@ retry:
|
||||||
syslog(LOG_INFO, "Requesting file %s to server\n", filename);
|
syslog(LOG_INFO, "Requesting file %s to server\n", filename);
|
||||||
|
|
||||||
tip_client_connect(argv[1]);
|
tip_client_connect(argv[1]);
|
||||||
_cli.state = TIP_CLIENT_RECEIVING_HEADER;
|
_cli.state = TIP_CLIENT_GET_HEADER;
|
||||||
|
|
||||||
while (_cli.state != TIP_CLIENT_DONE && !_cli.error)
|
while (_cli.state != TIP_CLIENT_DONE && !_cli.error)
|
||||||
ev_loop(tip_main_loop, 0);
|
ev_loop(tip_main_loop, 0);
|
||||||
|
|
Loading…
Reference in New Issue