misc/adsb-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch back to write(), since we have non-sockets.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-25 16:33:47 -08:00
parent 5e604f0596
commit a9dc7c25db
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
adsbus/send.c
View File

@@ -1,5 +1,6 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <signal.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -89,13 +90,14 @@ static bool send_hello(int fd, struct serializer *serializer) {
if (buf.length == 0) { if (buf.length == 0) {
return true; return true;
} }
if (send(fd, buf_at(&buf, 0), buf.length, MSG_NOSIGNAL) != buf.length) { if (write(fd, buf_at(&buf, 0), buf.length) != buf.length) {
return false; return false;
} }
return true; return true;
} }
void send_init() { void send_init() {
assert(signal(SIGPIPE, SIG_IGN) != SIG_ERR);
} }
void send_cleanup() { void send_cleanup() {
@@ -160,13 +162,13 @@ void send_write(struct packet *packet) {
if (buf.length == 0) { if (buf.length == 0) {
continue; continue;
} }
struct send *send_obj = serializer->send_head; struct send *send = serializer->send_head;
while (send_obj) { while (send) {
if (send(send_obj->peer.fd, buf_at(&buf, 0), buf.length, MSG_NOSIGNAL) != buf.length) { if (write(send->peer.fd, buf_at(&buf, 0), buf.length) != buf.length) {
// peer_loop() will see this shutdown and call send_del // peer_loop() will see this shutdown and call send_del
shutdown(send_obj->peer.fd, SHUT_RD | SHUT_WR); shutdown(send->peer.fd, SHUT_RD | SHUT_WR);
} }
send_obj = send_obj->next; send = send->next;
} }
} }
} }