diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-06-21 18:00:35 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-06-21 18:00:35 +0000 |
commit | 6a19a291bfbfc759971b57720ef75caaf941f680 (patch) | |
tree | 47f13d36533dafc7dad3b2d3324a43f74eb30839 | |
parent | 2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | network-demos-6a19a291bfbfc759971b57720ef75caaf941f680.tar.bz2 |
2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems_ttcp.c, ttcp_orig/ttcp.c: Now compiles reasonably cleanly with
CVS head.
-rw-r--r-- | ttcp/ChangeLog | 5 | ||||
-rw-r--r-- | ttcp/rtems_ttcp.c | 11 | ||||
-rw-r--r-- | ttcp/ttcp_orig/ttcp.c | 55 |
3 files changed, 41 insertions, 30 deletions
diff --git a/ttcp/ChangeLog b/ttcp/ChangeLog index 127312c..b4a7263 100644 --- a/ttcp/ChangeLog +++ b/ttcp/ChangeLog @@ -1,5 +1,10 @@ 2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> + * rtems_ttcp.c, ttcp_orig/ttcp.c: Now compiles reasonably cleanly with + CVS head. + +2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> + * init.c: confdefs.h should be rtems/confdefs.h 2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> diff --git a/ttcp/rtems_ttcp.c b/ttcp/rtems_ttcp.c index 9fbd774..0a4d81b 100644 --- a/ttcp/rtems_ttcp.c +++ b/ttcp/rtems_ttcp.c @@ -31,6 +31,8 @@ #include <netinet/in.h> #include <netdb.h> #include <sys/time.h> +#include <stdlib.h> +#include <signal.h> /* * Glue between UNIX-style ttcp code and RTEMS @@ -40,13 +42,8 @@ int rtems_ttcp_main (int argc, char **argv); static int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout) { - rtems_panic ("select()"); -} - -static void -(*signal(int sig, void (*func)()))() -{ - return 0;; + rtems_panic ("select()"); + return 0; } #define _SYS_RESOURCE_H_ diff --git a/ttcp/ttcp_orig/ttcp.c b/ttcp/ttcp_orig/ttcp.c index 0cc1c06..aa0f7cc 100644 --- a/ttcp/ttcp_orig/ttcp.c +++ b/ttcp/ttcp_orig/ttcp.c @@ -39,7 +39,7 @@ */ #ifndef lint -static char RCSid[] = "ttcp.c $Revision$"; +/* static char RCSid[] = "ttcp.c $Revision$"; */ #endif #define BSD43 @@ -74,7 +74,13 @@ struct sockaddr_in sinme; struct sockaddr_in sinhim; struct sockaddr_in frominet; -int domain, fromlen; +/* these make it easier to avoid warnings */ +struct sockaddr *sinhim_p = (struct sockaddr *) &sinhim; +struct sockaddr *sinme_p = (struct sockaddr *) &sinme; +struct sockaddr *frominet_p = (struct sockaddr *) &frominet; + +int domain; +socklen_t fromlen; int fd; /* fd of network socket */ int buflen = 8 * 1024; /* length of buffer */ @@ -136,7 +142,7 @@ double cput, realt; /* user, real time (seconds) */ void err(); void mes(); -int pattern(); +void pattern(); void prep_timer(); double read_timer(); int Nread(); @@ -150,7 +156,7 @@ sigpipe() { } -main(argc,argv) +int main(argc,argv) int argc; char **argv; { @@ -288,7 +294,7 @@ char **argv; err("socket"); mes("socket"); - if (bind(fd, &sinme, sizeof(sinme)) < 0) + if (bind(fd, sinme_p, sizeof(sinme)) < 0) err("bind"); #if defined(SO_SNDBUF) || defined(SO_RCVBUF) @@ -308,7 +314,9 @@ char **argv; #endif if (!udp) { +#if !defined(__rtems__) signal(SIGPIPE, sigpipe); +#endif if (trans) { /* We are the client if transmitting */ if (options) { @@ -329,7 +337,7 @@ char **argv; mes("nodelay"); } #endif - if(connect(fd, &sinhim, sizeof(sinhim) ) < 0) + if(connect(fd, sinhim_p, sizeof(sinhim) ) < 0) err("connect"); mes("connect"); } else { @@ -351,11 +359,11 @@ char **argv; } fromlen = sizeof(frominet); domain = AF_INET; - if((fd=accept(fd, &frominet, &fromlen) ) < 0) + if((fd=accept(fd, frominet_p, &fromlen) ) < 0) err("accept"); { struct sockaddr_in peer; - int peerlen = sizeof(peer); - if (getpeername(fd, (struct sockaddr_in *) &peer, + socklen_t peerlen = sizeof(peer); + if (getpeername(fd, (struct sockaddr *) &peer, &peerlen) < 0) { err("getpeername"); } @@ -426,7 +434,7 @@ char **argv; nbytes, cput, outfmt(nbytes/cput)); } fprintf(stdout, - "ttcp%s: %d I/O calls, msec/call = %.2f, calls/sec = %.2f\n", + "ttcp%s: %ld I/O calls, msec/call = %.2f, calls/sec = %.2f\n", trans?"-t":"-r", numCalls, 1024.0 * realt/((double)numCalls), @@ -434,7 +442,7 @@ char **argv; fprintf(stdout,"ttcp%s: %s\n", trans?"-t":"-r", stats); if (verbose) { fprintf(stdout, - "ttcp%s: buffer address %#x\n", + "ttcp%s: buffer address %p\n", trans?"-t":"-r", buf); } @@ -443,6 +451,7 @@ char **argv; usage: fprintf(stderr,Usage); exit(1); + return 0; } void @@ -462,7 +471,7 @@ char *s; fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s); } -pattern( cp, cnt ) +void pattern( cp, cnt ) register char *cp; register int cnt; { @@ -617,13 +626,13 @@ prusage(r0, r1, e, b, outp) case 'U': tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime); - sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000); + sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000); END(outp); break; case 'S': tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime); - sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000); + sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000); END(outp); break; @@ -645,18 +654,18 @@ prusage(r0, r1, e, b, outp) break; case 'X': - sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t); + sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t); END(outp); break; case 'D': - sprintf(outp,"%d", t == 0 ? 0 : + sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t); END(outp); break; case 'K': - sprintf(outp,"%d", t == 0 ? 0 : + sprintf(outp,"%ld", t == 0 ? 0 : ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) - (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t); END(outp); @@ -746,16 +755,16 @@ register char *cp; /* * N R E A D */ -Nread( fd, buf, count ) +int Nread( fd, buf, count ) int fd; void *buf; int count; { struct sockaddr_in from; - int len = sizeof(from); + socklen_t len = sizeof(from); register int cnt; if( udp ) { - cnt = recvfrom( fd, buf, count, 0, &from, &len ); + cnt = recvfrom( fd, buf, count, 0, (struct sockaddr *)&from, &len ); numCalls++; } else { if( b_flag ) @@ -777,7 +786,7 @@ int count; /* * N W R I T E */ -Nwrite( fd, buf, count ) +int Nwrite( fd, buf, count ) int fd; void *buf; int count; @@ -785,7 +794,7 @@ int count; register int cnt; if( udp ) { again: - cnt = sendto( fd, buf, count, 0, &sinhim, sizeof(sinhim) ); + cnt = sendto( fd, buf, count, 0, sinhim_p, sizeof(sinhim) ); numCalls++; if( cnt<0 && errno == ENOBUFS ) { printf("ttcp: out of buffers -- delaying\n"); /*JRS*/ @@ -807,7 +816,7 @@ delay(us) tv.tv_sec = 0; tv.tv_usec = us; - (void)select( 1, (char *)0, (char *)0, (char *)0, &tv ); + (void)select( 1, (fd_set *)0, (fd_set *)0, (fd_set *)0, &tv ); } /* |