Page MenuHomeFreeBSD
Differential D14505

Use a private definition of osockaddr rather then relying on type namespace polution in sys/socket.h.
ClosedPublic
Actions

Authored by brooks on Feb 25 2018, 6:42 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 4, 11:04 PM
Unknown Object (File)
Mon, Mar 17, 10:21 AM
Unknown Object (File)
Sun, Mar 16, 8:24 PM
Unknown Object (File)
Jan 17 2025, 2:17 PM
Unknown Object (File)
Jan 5 2025, 8:26 AM
Unknown Object (File)
Dec 26 2024, 1:16 AM
Unknown Object (File)
Dec 11 2024, 8:48 AM
Unknown Object (File)
Dec 6 2024, 4:51 PM
View All 73 Files
Subscribers
imp

Details

Reviewers
None
Commits
rS343161: Use a private definition of osockaddr rather then relying on type
Summary

Remove support for operation on 4.3BSD.

PR: 224529

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

brooks created this revision.Feb 25 2018, 6:42 PM
Harbormaster completed remote builds in B15259: Diff 39712.Feb 25 2018, 6:42 PM
brooks retitled this revision from Use a private definition of sockaddr rather then relying on type namespace polution in sys/socket.h. to Use a private definition of osockaddr rather then relying on type namespace polution in sys/socket.h..Apr 5 2018, 11:29 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jan 18 2019, 9:30 PM
Closed by commit rS343161: Use a private definition of osockaddr rather then relying on type (authored by brooks). · Explain Why
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: imp. · View Herald TranscriptJan 18 2019, 9:30 PM

Revision Contents
Changeset List

PathSize
head/
include/
protocols/
15 lines
libexec/
talkd/
3 lines
usr.bin/
talk/
6 lines
6 lines

Diff 53018

View Options

head/include/protocols/talkd.h

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines
* to broadcast an announcement on the callee's login ports requesting * to broadcast an announcement on the callee's login ports requesting
* contact. When the callee responds, the local server uses the * contact. When the callee responds, the local server uses the
* recorded invitation to respond with the appropriate rendezvous * recorded invitation to respond with the appropriate rendezvous
* address and the caller and callee client programs establish a * address and the caller and callee client programs establish a
* stream connection through which the conversation takes place. * stream connection through which the conversation takes place.
*/ */
/* /*
* The talk protocol embeds a 4.3BSD sockaddr. Define our own version
* rather then relying on namespace polution in kernel headers.
*/
struct tsockaddr {
unsigned short sa_family;
char sa_data[14];
};
/*
* Client->server request message format. * Client->server request message format.
*/ */
typedef struct { typedef struct {
u_char vers; /* protocol version */ u_char vers; /* protocol version */
u_char type; /* request type, see below */ u_char type; /* request type, see below */
u_char answer; /* not used */ u_char answer; /* not used */
u_char pad; u_char pad;
u_int32_t id_num; /* message id */ u_int32_t id_num; /* message id */
struct osockaddr addr; /* old (4.3) style */ struct tsockaddr addr; /* old (4.3) style */
struct osockaddr ctl_addr; /* old (4.3) style */ struct tsockaddr ctl_addr; /* old (4.3) style */
int32_t pid; /* caller's process id */ int32_t pid; /* caller's process id */
#define NAME_SIZE 12 #define NAME_SIZE 12
char l_name[NAME_SIZE];/* caller's name */ char l_name[NAME_SIZE];/* caller's name */
char r_name[NAME_SIZE];/* callee's name */ char r_name[NAME_SIZE];/* callee's name */
#define TTY_SIZE 16 #define TTY_SIZE 16
char r_tty[TTY_SIZE];/* callee's tty name */ char r_tty[TTY_SIZE];/* callee's tty name */
} CTL_MSG; } CTL_MSG;
/* /*
* Server->client response message format. * Server->client response message format.
*/ */
typedef struct { typedef struct {
u_char vers; /* protocol version */ u_char vers; /* protocol version */
u_char type; /* type of request message, see below */ u_char type; /* type of request message, see below */
u_char answer; /* respose to request message, see below */ u_char answer; /* respose to request message, see below */
u_char pad; u_char pad;
u_int32_t id_num; /* message id */ u_int32_t id_num; /* message id */
struct osockaddr addr; /* address for establishing conversation */ struct tsockaddr addr; /* address for establishing conversation */
} CTL_RESPONSE; } CTL_RESPONSE;
#define TALK_VERSION 1 /* protocol version */ #define TALK_VERSION 1 /* protocol version */
/* message type values */ /* message type values */
#define LEAVE_INVITE 0 /* leave invitation with server */ #define LEAVE_INVITE 0 /* leave invitation with server */
#define LOOK_UP 1 /* check for invitation by callee */ #define LOOK_UP 1 /* check for invitation by callee */
#define DELETE 2 /* delete invitation by caller */ #define DELETE 2 /* delete invitation by caller */
Show All 21 Lines
View Options

head/libexec/talkd/talkd.c

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Lines#endif
for (;;) { for (;;) {
cc = recv(0, (char *)mp, sizeof(*mp), 0); cc = recv(0, (char *)mp, sizeof(*mp), 0);
if (cc != sizeof (*mp)) { if (cc != sizeof (*mp)) {
if (cc < 0 && errno != EINTR) if (cc < 0 && errno != EINTR)
syslog(LOG_WARNING, "recv: %m"); syslog(LOG_WARNING, "recv: %m");
continue; continue;
} }
lastmsgtime = time(0); lastmsgtime = time(0);
(void)memcpy(&ctl_addr, &mp->ctl_addr, sizeof(ctl_addr)); (void)memcpy(&ctl_addr.sa_data, &mp->ctl_addr.sa_data,
sizeof(ctl_addr.sa_data));
ctl_addr.sa_family = ntohs(mp->ctl_addr.sa_family); ctl_addr.sa_family = ntohs(mp->ctl_addr.sa_family);
ctl_addr.sa_len = sizeof(ctl_addr); ctl_addr.sa_len = sizeof(ctl_addr);
process_request(mp, &response); process_request(mp, &response);
/* can block here, is this what I want? */ /* can block here, is this what I want? */
cc = sendto(STDIN_FILENO, (char *)&response, cc = sendto(STDIN_FILENO, (char *)&response,
sizeof(response), 0, &ctl_addr, sizeof(ctl_addr)); sizeof(response), 0, &ctl_addr, sizeof(ctl_addr));
if (cc != sizeof (response)) if (cc != sizeof (response))
syslog(LOG_WARNING, "sendto: %m"); syslog(LOG_WARNING, "sendto: %m");
Show All 13 Lines
View Options

head/usr.bin/talk/invite.c

Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Linesinvite_remote(void)
struct itimerval itimer; struct itimerval itimer;
CTL_RESPONSE response; CTL_RESPONSE response;
itimer.it_value.tv_sec = RING_WAIT; itimer.it_value.tv_sec = RING_WAIT;
itimer.it_value.tv_usec = 0; itimer.it_value.tv_usec = 0;
itimer.it_interval = itimer.it_value; itimer.it_interval = itimer.it_value;
if (listen(sockt, 5) != 0) if (listen(sockt, 5) != 0)
p_error("Error on attempt to listen for caller"); p_error("Error on attempt to listen for caller");
#ifdef MSG_EOR
/* copy new style sockaddr to old, swap family (short in old) */ /* 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); 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 */ msg.id_num = htonl(-1); /* an impossible id_num */
invitation_waiting = 1; invitation_waiting = 1;
announce_invite(); announce_invite();
/* /*
* Shut off the automatic messages for a while, * Shut off the automatic messages for a while,
* so we can use the interrupt timer to resend the invitation * so we can use the interrupt timer to resend the invitation
*/ */
end_msgs(); end_msgs();
▲ Show 20 Lines • Show All 104 Lines • Show Last 20 Lines
View Options

head/usr.bin/talk/look_up.c

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Lines
int int
check_local(void) check_local(void)
{ {
CTL_RESPONSE response; CTL_RESPONSE response;
CTL_RESPONSE *rp = &response; CTL_RESPONSE *rp = &response;
struct sockaddr addr; struct sockaddr addr;
/* the rest of msg was set up in get_names */ /* the rest of msg was set up in get_names */
#ifdef MSG_EOR
/* copy new style sockaddr to old, swap family (short in old) */ /* 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); msg.ctl_addr.sa_family = htons(ctl_addr.sin_family);
#else
msg.ctl_addr = *(struct sockaddr *)&ctl_addr;
#endif
/* must be initiating a talk */ /* must be initiating a talk */
if (!look_for_invite(rp)) if (!look_for_invite(rp))
return (0); return (0);
/* /*
* There was an invitation waiting for us, * There was an invitation waiting for us,
* so connect with the other (hopefully waiting) party * so connect with the other (hopefully waiting) party
*/ */
current_state = "Waiting to connect with caller"; current_state = "Waiting to connect with caller";
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines