diff options
author | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-29 01:59:16 +0000 |
---|---|---|
committer | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-29 01:59:16 +0000 |
commit | 69ea23ed7175d5c34a21bba1ef9262f311c69284 (patch) | |
tree | e2e604e83659be7f58596e80b3cf18e9d7d06dae /net/nettest/files/patch-nettest.c | |
parent | Stage net-mgmt/routers2 and cleanup (diff) |
Rename net/ patch-xy patches to reflect the files they modify.
Approve by: portmgr (not really, but one of these is modifying
an unstaged port)
Notes
Notes:
svn path=/head/; revision=363285
Diffstat (limited to 'net/nettest/files/patch-nettest.c')
-rw-r--r-- | net/nettest/files/patch-nettest.c | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/net/nettest/files/patch-nettest.c b/net/nettest/files/patch-nettest.c new file mode 100644 index 000000000000..151746bf75f5 --- /dev/null +++ b/net/nettest/files/patch-nettest.c @@ -0,0 +1,95 @@ +*** nettest.c.orig Thu Nov 5 15:52:58 1992 +--- nettest.c Sun Sep 19 17:33:02 1999 +*************** +*** 92,98 **** +--- 92,102 ---- + int nodelay = 0; + int mesghdr = 0; + ++ #ifdef BSD44 ++ clock_t times(); ++ #else + long times(); ++ #endif + #if !defined(CRAY) && !defined(SYSV) + #define GETTIMES(a, b) ftime(&a); times(&b); + #define TIMETYPE struct timeb +*************** +*** 126,132 **** + + void do_children(), do_stream(), usage(), do_dgram(), prtimes(); + +! int read(), recv(); + + int (*rfunc)() = read; + +--- 130,137 ---- + + void do_children(), do_stream(), usage(), do_dgram(), prtimes(); + +! int read(); +! ssize_t recv(); + + int (*rfunc)() = read; + +*************** +*** 550,556 **** +--- 555,565 ---- + shutdown(s, 2); + exit(0); + } ++ #ifdef BSD44 ++ if (connect(s, (struct sockaddr *)&name, namesize) < 0) { ++ #else + if (connect(s, (char *)&name, namesize) < 0) { ++ #endif + perror("connect"); + exit(1); + } +*************** +*** 1160,1167 **** + *data = 0; + for (i = 0; i < nchunks; i++) { + ret = mesghdr ? sendmsg(s, &outmsg, 0) +! : sendto(s, data, chunksize, 0, (caddr_t)&name, +! namesize); + + if (ret < 0) { + perror(mesghdr ? "sendmsg" : "sendto"); +--- 1169,1176 ---- + *data = 0; + for (i = 0; i < nchunks; i++) { + ret = mesghdr ? sendmsg(s, &outmsg, 0) +! : sendto(s, data, chunksize, 0, +! (struct sockaddr *)&name, namesize); + + if (ret < 0) { + perror(mesghdr ? "sendmsg" : "sendto"); +*************** +*** 1397,1408 **** + register char *c; + int tos; + + #ifdef IP_TOS + struct tosent *tosp; + +! tosp = gettosbyname(name, proto); + if (tosp) { +! tos = tosp->t_tos; + } else { + #endif + for (c = name; *c; c++) { +--- 1406,1418 ---- + register char *c; + int tos; + ++ #undef IP_TOS + #ifdef IP_TOS + struct tosent *tosp; + +! tosp = (struct tosent *)gettosbyname(name, proto); + if (tosp) { +! tos = (int)tosp->t_tos; + } else { + #endif + for (c = name; *c; c++) { |