mherrb/echoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up variable declarations.

Browse source
This commit is contained in:
Matthieu Herrb 2012-07-31 11:26:45 +02:00
parent 1bc5c2ff5d
commit e651005e16
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
echoc.c
View file

@ -35,10 +35,6 @@ int verbose = 0;
struct sockaddr *server; struct sockaddr *server;
socklen_t serverlen; socklen_t serverlen;
unsigned int seq = 0; unsigned int seq = 0;
int disconnected;
struct timeval sent;
#define THRESHOLD 10
static void static void
usage(void) usage(void)
@ -67,6 +63,8 @@ main(int argc, char *argv[])
struct sockaddr_storage client; struct sockaddr_storage client;
struct addrinfo hints, *res, *res0; struct addrinfo hints, *res, *res0;
struct itimerval itv; struct itimerval itv;
struct timeval last_ts;
struct timeval now, diff;
struct tm *tm; struct tm *tm;
struct pollfd pfd[1]; struct pollfd pfd[1];
socklen_t addrlen; socklen_t addrlen;
@ -75,6 +73,7 @@ main(int argc, char *argv[])
int ch; int ch;
int nfds, received = 0; int nfds, received = 0;
int error, buffer, last = -1; int error, buffer, last = -1;
int disconnected;
extern int optind; extern int optind;
setbuf(stdout, NULL); setbuf(stdout, NULL);
@ -139,19 +138,16 @@ main(int argc, char *argv[])
signal(SIGALRM, send_packet); signal(SIGALRM, send_packet);
/* send initial packet */ gettimeofday(&last_ts, NULL);
gettimeofday(&sent, NULL);
send_packet(0);
while (1) { while (1) {
struct timeval now, diff; /* poll() loop to handle interruptions by SIGALRM */
while (1) { while (1) {
pfd[0].fd = sock; pfd[0].fd = sock;
pfd[0].events = POLLIN; pfd[0].events = POLLIN;
nfds = poll(pfd, 1, timeout); nfds = poll(pfd, 1, timeout);
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
timersub(&now, &sent, &diff); timersub(&now, &last_ts, &diff);
if (nfds > 0) if (nfds > 0)
break; break;
if (nfds == -1 && errno != EINTR) if (nfds == -1 && errno != EINTR)
@ -204,7 +200,7 @@ main(int argc, char *argv[])
disconnected = 0; disconnected = 0;
} }
last = buffer; last = buffer;
gettimeofday(&sent, NULL); gettimeofday(&last_ts, NULL);
if (verbose) if (verbose)
printf("received %d %ld.%06ld\n", buffer, printf("received %d %ld.%06ld\n", buffer,
(long)diff.tv_sec, diff.tv_usec); (long)diff.tv_sec, diff.tv_usec);