diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2019-01-18 21:30:06 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2019-01-18 21:30:06 +0000 |
| commit | e4478d7e46876142b5f75cfc93ef649a6bde05ae (patch) | |
| tree | 7a6cf3249776d0c53db59202ed08ff9d6f4a2ef4 /usr.bin/talk | |
| parent | 03d9c6aa55b57d3d35756da1d2784fa3e5fabc7b (diff) | |
| download | src-test-e4478d7e46876142b5f75cfc93ef649a6bde05ae.tar.gz src-test-e4478d7e46876142b5f75cfc93ef649a6bde05ae.zip | |
Use a private definition of osockaddr rather then relying on type
namespace polution in sys/socket.h.
Also remove support for operation on 4.3BSD.
PR: 224529
Differential Revision: https://reviews.freebsd.org/D14505
Notes
Notes:
svn path=/head/; revision=343161
Diffstat (limited to 'usr.bin/talk')
| -rw-r--r-- | usr.bin/talk/invite.c | 6 | ||||
| -rw-r--r-- | usr.bin/talk/look_up.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c index 8f811a5c55e47..e000e54b0c35f 100644 --- a/usr.bin/talk/invite.c +++ b/usr.bin/talk/invite.c @@ -77,13 +77,9 @@ invite_remote(void) itimer.it_interval = itimer.it_value; if (listen(sockt, 5) != 0) p_error("Error on attempt to listen for caller"); -#ifdef MSG_EOR /* copy new style sockaddr to old, swap family (short in old) */ - msg.addr = *(struct osockaddr *)&my_addr; /* XXX new to old style*/ + msg.addr = *(struct tsockaddr *)&my_addr; msg.addr.sa_family = htons(my_addr.sin_family); -#else - msg.addr = *(struct sockaddr *)&my_addr; -#endif msg.id_num = htonl(-1); /* an impossible id_num */ invitation_waiting = 1; announce_invite(); diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c index 1b6ba327c59f4..3c676b9c1ea27 100644 --- a/usr.bin/talk/look_up.c +++ b/usr.bin/talk/look_up.c @@ -59,13 +59,9 @@ check_local(void) struct sockaddr addr; /* the rest of msg was set up in get_names */ -#ifdef MSG_EOR /* copy new style sockaddr to old, swap family (short in old) */ - msg.ctl_addr = *(struct osockaddr *)&ctl_addr; + msg.ctl_addr = *(struct tsockaddr *)&ctl_addr; msg.ctl_addr.sa_family = htons(ctl_addr.sin_family); -#else - msg.ctl_addr = *(struct sockaddr *)&ctl_addr; -#endif /* must be initiating a talk */ if (!look_for_invite(rp)) return (0); |