diff options
Diffstat (limited to 'net/nettest/files')
| -rw-r--r-- | net/nettest/files/patch-aa | 38 | ||||
| -rw-r--r-- | net/nettest/files/patch-ab | 77 | ||||
| -rw-r--r-- | net/nettest/files/patch-ac | 59 |
3 files changed, 174 insertions, 0 deletions
diff --git a/net/nettest/files/patch-aa b/net/nettest/files/patch-aa new file mode 100644 index 0000000..fd16c80 --- /dev/null +++ b/net/nettest/files/patch-aa @@ -0,0 +1,38 @@ +*** Makefile.orig Thu Nov 5 16:03:14 1992 +--- Makefile Mon Oct 20 12:50:14 1997 +*************** +*** 3,12 **** + FILES=README Makefile nettest.h nettest.c nettestd.c nettest.8 + + all: +! @if [ -f /bin/hostname -o -f /usr/bin/hostname ]; then \ +! $(MAKE) `hostname`; \ +! elif [ -f /bin/uname ]; then \ +! $(MAKE) `uname -n`; \ + else \ + echo You must specify what machine you are on,;\ + echo e.g. \"make sun\", \"make cray2\", \"make pyramid\", \"make xmp\";\ +--- 3,10 ---- + FILES=README Makefile nettest.h nettest.c nettestd.c nettest.8 + + all: +! @if [ -f /bin/uname -o -f /usr/bin/uname ]; then \ +! $(MAKE) `uname -s`; \ + else \ + echo You must specify what machine you are on,;\ + echo e.g. \"make sun\", \"make cray2\", \"make pyramid\", \"make xmp\";\ +*************** +*** 32,37 **** +--- 30,41 ---- + INCLUDE="-I." \ + DEFINES="-DWAIT3CODE -DNO_ISO" \ + LIBS="" OPT="-O" ++ ++ FreeBSD: ++ $(MAKE) objs \ ++ INCLUDE="" \ ++ DEFINES="-DWAIT3CODE -DBSD44 -DNAMEDPIPES -DNO_ISO" \ ++ OPT="-O" LIBS="-lcompat" + + 4.4alpha: + $(MAKE) objs \ diff --git a/net/nettest/files/patch-ab b/net/nettest/files/patch-ab new file mode 100644 index 0000000..86333d7 --- /dev/null +++ b/net/nettest/files/patch-ab @@ -0,0 +1,77 @@ +*** nettest.c.orig Thu Nov 5 15:52:58 1992 +--- nettest.c Mon Oct 20 12:50:20 1997 +*************** +*** 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 +*************** +*** 550,556 **** +--- 554,564 ---- + 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"); +--- 1168,1175 ---- + *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++) { +--- 1405,1417 ---- + 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++) { diff --git a/net/nettest/files/patch-ac b/net/nettest/files/patch-ac new file mode 100644 index 0000000..4ed2ce3 --- /dev/null +++ b/net/nettest/files/patch-ac @@ -0,0 +1,59 @@ +*** nettestd.c.orig Thu Nov 5 15:52:58 1992 +--- nettestd.c Mon Oct 20 13:28:06 1997 +*************** +*** 416,422 **** + ) + error("setsockopt (IP_OPTIONS)"); + #endif +! if (bind(s, (char *)&name, namesize) < 0) { + error("bind"); + exit(1); + } +--- 416,422 ---- + ) + error("setsockopt (IP_OPTIONS)"); + #endif +! if (bind(s, (struct sockaddr *)&name, namesize) < 0) { + error("bind"); + exit(1); + } +*************** +*** 447,456 **** + #endif + listen(s, 5); + +! signal(SIGCHLD, dochild); + for (;;) { + namesize = sizeof(name); +! s2 = accept(s, (char *)&name, &namesize); + if (s2 < 0) { + extern int errno; + if (errno == EINTR) +--- 447,456 ---- + #endif + listen(s, 5); + +! signal(SIGCHLD, (void *)dochild); + for (;;) { + namesize = sizeof(name); +! s2 = accept(s, (struct sockaddr *)&name, &namesize); + if (s2 < 0) { + extern int errno; + if (errno == EINTR) +*************** +*** 723,729 **** + #endif + { + namesize = sizeof(name.d_inet); +! t = recvfrom(s, data, MAXSIZE, 0, (char *)&name.d_inet, + &namesize); + } + if (t < 0) { +--- 723,729 ---- + #endif + { + namesize = sizeof(name.d_inet); +! t = recvfrom(s, data, MAXSIZE, 0, (struct sockaddr *)&name.d_inet, + &namesize); + } + if (t < 0) { |
