From 99d21d504cd3ea6da3c0c6c1e3eb990bd0b6ea7b Mon Sep 17 00:00:00 2001 From: "Tim J. Robbins" Date: Sun, 28 Sep 2003 09:16:09 +0000 Subject: [PATCH] Use the new style struct sockaddr instead of osockaddr in system calls so that talkd works without COMPAT_43. Obtained from: NetBSD (christos), Rumi Szabolcs --- libexec/talkd/talkd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c index ae2c6eb05f3e..66ae372589be 100644 --- a/libexec/talkd/talkd.c +++ b/libexec/talkd/talkd.c @@ -86,6 +86,7 @@ main(int argc, char *argv[]) { register CTL_MSG *mp = &request; int cc; + struct sockaddr ctl_addr; #ifdef NOTDEF /* @@ -116,12 +117,13 @@ main(int argc, char *argv[]) continue; } lastmsgtime = time(0); + (void)memcpy(&ctl_addr, &mp->ctl_addr, sizeof(ctl_addr)); + ctl_addr.sa_family = ntohs(mp->ctl_addr.sa_family); + ctl_addr.sa_len = sizeof(ctl_addr); process_request(mp, &response); /* can block here, is this what I want? */ - mp->ctl_addr.sa_family = htons(mp->ctl_addr.sa_family); - cc = sendto(sockt, (char *)&response, - sizeof (response), 0, (struct sockaddr *)&mp->ctl_addr, - sizeof (mp->ctl_addr)); + cc = sendto(sockt, (char *)&response, sizeof (response), 0, + &ctl_addr, sizeof (ctl_addr)); if (cc != sizeof (response)) syslog(LOG_WARNING, "sendto: %m"); }