~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEW etc.: Use NEW in all obvious places
[secnet]
/
netlink.c
diff --git
a/netlink.c
b/netlink.c
index
b54327b
..
e180b1d
100644
(file)
--- a/
netlink.c
+++ b/
netlink.c
@@
-386,7
+386,7
@@
static uint16_t netlink_icmp_reply_len(struct buffer_if *buf)
/* We include the first 8 bytes of the packet data, provided they exist */
hlen+=8;
plen=ntohs(iph->tot_len);
/* We include the first 8 bytes of the packet data, provided they exist */
hlen+=8;
plen=ntohs(iph->tot_len);
- return
(hlen>plen?plen:h
len);
+ return
MIN(hlen,p
len);
}
/* client indicates where the packet we're constructing a response to
}
/* client indicates where the packet we're constructing a response to
@@
-430,7
+430,7
@@
static void netlink_icmp_simple(struct netlink *st,
len=netlink_icmp_reply_len(buf);
h=netlink_icmp_tmpl(st,icmpsource,icmpdest,len);
h->type=type; h->code=code; h->d=info;
len=netlink_icmp_reply_len(buf);
h=netlink_icmp_tmpl(st,icmpsource,icmpdest,len);
h->type=type; h->code=code; h->d=info;
-
memcpy(buf_append(&st->icmp,len)
,buf->start,len);
+
BUF_ADD_BYTES(append,&st->icmp
,buf->start,len);
netlink_icmp_csum(h);
if (!st->ptp) {
netlink_icmp_csum(h);
if (!st->ptp) {
@@
-591,7
+591,7
@@
static void netlink_maybe_fragment(struct netlink *st,
long avail = mtu - hl;
long remain = endindata - indata;
long use = avail < remain ? (avail & ~(long)7) : remain;
long avail = mtu - hl;
long remain = endindata - indata;
long use = avail < remain ? (avail & ~(long)7) : remain;
-
memcpy(buf_append(buf, use)
, indata, use);
+
BUF_ADD_BYTES(append, buf
, indata, use);
indata += use;
_Bool last_frag = indata >= endindata;
indata += use;
_Bool last_frag = indata >= endindata;
@@
-976,7
+976,6
@@
static void netlink_output_subnets(struct netlink *st, uint32_t loglevel,
for (i=0; i<snets->entries; i++) {
net=subnet_to_string(snets->list[i]);
Message(loglevel,"%s ",net);
for (i=0; i<snets->entries; i++) {
net=subnet_to_string(snets->list[i]);
Message(loglevel,"%s ",net);
- free(net);
}
}
}
}
@@
-1014,7
+1013,6
@@
static void netlink_dump_routes(struct netlink *st, bool_t requested)
for (i=0; i<st->subnets->entries; i++) {
net=subnet_to_string(st->subnets->list[i]);
Message(c,"%s ",net);
for (i=0; i<st->subnets->entries; i++) {
net=subnet_to_string(st->subnets->list[i]);
Message(c,"%s ",net);
- free(net);
}
if (i>0)
Message(c,"-> host (use %d)\n",st->outcount);
}
if (i>0)
Message(c,"-> host (use %d)\n",st->outcount);
@@
-1140,7
+1138,7
@@
static closure_t *netlink_inst_create(struct netlink *st,
return NULL;
}
return NULL;
}
-
c=safe_malloc(sizeof(*c),"netlink_inst_create"
);
+
NEW(c
);
c->cl.description=name;
c->cl.type=CL_NETLINK;
c->cl.apply=NULL;
c->cl.description=name;
c->cl.type=CL_NETLINK;
c->cl.apply=NULL;
@@
-1309,7
+1307,7
@@
static list_t *null_apply(closure_t *self, struct cloc loc, dict_t *context,
item_t *item;
dict_t *dict;
item_t *item;
dict_t *dict;
-
st=safe_malloc(sizeof(*st),"null_apply"
);
+
NEW(st
);
item=list_elem(args,0);
if (!item || item->type!=t_dict)
item=list_elem(args,0);
if (!item || item->type!=t_dict)