summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
52e9244)
This makes the code clearer, shorter and more typesafe.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <bsd/sys/queue.h>
+
#define MAX_PEER_ADDRS 5
/* send at most this many copies; honour at most that many addresses */
#define MAX_PEER_ADDRS 5
/* send at most this many copies; honour at most that many addresses */
static comm_release_notify_fn release_notify;
static comm_sendmsg_fn udp_sendmsg;
static comm_release_notify_fn release_notify;
static comm_sendmsg_fn udp_sendmsg;
+struct comm_notify_entry {
comm_notify_fn *fn;
void *state;
comm_notify_fn *fn;
void *state;
- struct notify_list *next;
+ LIST_ENTRY(comm_notify_entry) entry;
+LIST_HEAD(comm_notify_list, comm_notify_entry) notify;
#define MAX_SOCKETS 3 /* 2 ought to do really */
#define MAX_SOCKETS 3 /* 2 ought to do really */
struct udpsock socks[MAX_SOCKETS];
string_t authbind;
struct buffer_if *rbuf;
struct udpsock socks[MAX_SOCKETS];
string_t authbind;
struct buffer_if *rbuf;
- struct notify_list *notify;
+ struct comm_notify_list notify;
bool_t use_proxy;
union iaddr proxy;
};
bool_t use_proxy;
union iaddr proxy;
};
struct udp *st=state;
union iaddr from;
socklen_t fromlen;
struct udp *st=state;
union iaddr from;
socklen_t fromlen;
+ struct comm_notify_entry *n;
bool_t done;
int rv;
int i;
bool_t done;
int rv;
int i;
ca.ia=from;
ca.ix=i;
done=False;
ca.ia=from;
ca.ix=i;
done=False;
- for (n=st->notify; n; n=n->next) {
+ LIST_FOREACH(n, &st->notify, entry) {
if (n->fn(n->state, st->rbuf, &ca)) {
done=True;
break;
if (n->fn(n->state, st->rbuf, &ca)) {
done=True;
break;
static void request_notify(void *commst, void *nst, comm_notify_fn *fn)
{
struct udp *st=commst;
static void request_notify(void *commst, void *nst, comm_notify_fn *fn)
{
struct udp *st=commst;
+ struct comm_notify_entry *n;
n=safe_malloc(sizeof(*n),"request_notify");
n->fn=fn;
n->state=nst;
n=safe_malloc(sizeof(*n),"request_notify");
n->fn=fn;
n->state=nst;
- n->next=st->notify;
- st->notify=n;
+ LIST_INSERT_HEAD(&st->notify, n, entry);
}
static void release_notify(void *commst, void *nst, comm_notify_fn *fn)
{
struct udp *st=commst;
}
static void release_notify(void *commst, void *nst, comm_notify_fn *fn)
{
struct udp *st=commst;
- struct notify_list *n, **p, *t;
+ struct comm_notify_entry *n, *t;
- p=&st->notify;
- for (n=st->notify; n; )
- {
+ LIST_FOREACH_SAFE(n, &st->notify, entry, t) {
if (n->state==nst && n->fn==fn) {
if (n->state==nst && n->fn==fn) {
- t=n;
- *p=n->next;
- n=n->next;
- free(t);
- } else {
- p=&n->next;
- n=n->next;
+ LIST_REMOVE(n, entry);
+ free(n);
st->ops.sendmsg=udp_sendmsg;
st->ops.addr_to_string=addr_to_string;
st->use_proxy=False;
st->ops.sendmsg=udp_sendmsg;
st->ops.addr_to_string=addr_to_string;
st->use_proxy=False;
+ LIST_INIT(&st->notify);
item=list_elem(args,0);
if (!item || item->type!=t_dict) {
item=list_elem(args,0);
if (!item || item->type!=t_dict) {