Skip to content

Followed up cleanups #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2022
Merged

Followed up cleanups #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 15 additions & 26 deletions src/netlog/netlog-network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,34 +153,22 @@ int manager_push_to_network(Manager *m,
/* Ninth: message */
IOVEC_SET_STRING(iov[n++], message);

/* Tenth: Optional newline message separator, if not implicitly terminated by end of UDP frame */
if (SYSLOG_TRANSMISSION_PROTOCOL_TCP == m->protocol)
/* De facto standard: separate messages by a newline */
/* Tenth: Optional newline message separator, if not implicitly terminated by end of UDP frame
* De facto standard: separate messages by a newline
*/
if (m->protocol == SYSLOG_TRANSMISSION_PROTOCOL_TCP)
IOVEC_SET_STRING(iov[n++], "\n");
else if (SYSLOG_TRANSMISSION_PROTOCOL_UDP == m->protocol) {
/* Message is implicitly terminated by end of UDP packet */
} else
return -EPROTONOSUPPORT;

return network_send(m, iov, n);
}

void manager_close_network_socket(Manager *m) {
assert(m);

switch (m->protocol) {
case SYSLOG_TRANSMISSION_PROTOCOL_UDP:
/* shutdown not required */
break;
case SYSLOG_TRANSMISSION_PROTOCOL_TCP:
{
int r = shutdown(m->socket, SHUT_RDWR);
if (r < 0)
log_error_errno(r, "Failed to shutdown netlog socket: %m");
}
break;
default:
break;
if (m->protocol == SYSLOG_TRANSMISSION_PROTOCOL_TCP) {
int r = shutdown(m->socket, SHUT_RDWR);
if (r < 0)
log_error_errno(r, "Failed to shutdown netlog socket: %m");
}

m->socket = safe_close(m->socket);
Expand Down Expand Up @@ -208,10 +196,12 @@ int manager_open_network_socket(Manager *m) {
if (m->socket < 0)
return -errno;

r = setsockopt(m->socket, IPPROTO_IP, IP_MULTICAST_LOOP, &one, sizeof(one));
if (r < 0) {
r = -errno;
goto fail;
if (m->protocol == SYSLOG_TRANSMISSION_PROTOCOL_UDP) {
r = setsockopt(m->socket, IPPROTO_IP, IP_MULTICAST_LOOP, &one, sizeof(one));
if (r < 0) {
r = -errno;
goto fail;
}
}

if (SYSLOG_TRANSMISSION_PROTOCOL_TCP == m->protocol) {
Expand Down Expand Up @@ -239,7 +229,7 @@ int manager_open_network_socket(Manager *m) {
goto fail;
}
r = connect(m->socket, &m->address.sockaddr.sa, salen);
if (r < 0) {
if (r < 0 && errno != EINPROGRESS) {
r = -errno;
goto fail;
}
Expand All @@ -257,6 +247,5 @@ int manager_open_network_socket(Manager *m) {

fail:
m->socket = safe_close(m->socket);

return r;
}