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

Make epoll_fd global as a concession to clarity. Handle client disconnection even when silent.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-17 15:41:27 -08:00
parent 908a364aef
commit e14b444466
9 changed files with 107 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
incoming.c
View File

@@ -6,7 +6,6 @@
#include <netdb.h>
#include <string.h>
#include <errno.h>
#include <sys/epoll.h>
#include "common.h"
#include "incoming.h"
@@ -22,7 +21,7 @@ struct incoming {
};
static void incoming_handler(struct peer *peer, int epoll_fd) {
static void incoming_handler(struct peer *peer) {
struct incoming *incoming = (struct incoming *) peer;
struct sockaddr peer_addr, local_addr;
@@ -45,10 +44,10 @@ static void incoming_handler(struct peer *peer, int epoll_fd) {
local_hbuf, local_sbuf,
peer_hbuf, peer_sbuf);
incoming->handler(fd, epoll_fd, incoming->passthrough);
incoming->handler(fd, incoming->passthrough);
}
void incoming_new(char *node, char *service, int epoll_fd, incoming_connection_handler handler, void *passthrough) {
void incoming_new(char *node, char *service, incoming_connection_handler handler, void *passthrough) {
struct incoming *incoming = malloc(sizeof(*incoming));
incoming->peer.event_handler = incoming_handler;
uuid_gen(incoming->id);
@@ -103,5 +102,5 @@ void incoming_new(char *node, char *service, int epoll_fd, incoming_connection_h
return;
}
peer_epoll_add((struct peer *) incoming, epoll_fd, EPOLLIN);
peer_epoll_add((struct peer *) incoming, EPOLLIN);
}