/* We include the first 8 bytes of the packet data, provided they exist */
hlen+=8;
plen=ntohs(iph->tot_len);
- return (hlen>plen?plen:hlen);
+ return MIN(hlen,plen);
}
/* client indicates where the packet we're constructing a response to
for (i=0; i<snets->entries; i++) {
net=subnet_to_string(snets->list[i]);
Message(loglevel,"%s ",net);
- free(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);
/* All the networks serviced by the various tunnels should now
* have been registered. We build a routing table by sorting the
* clients by priority. */
- st->routes=safe_malloc_ary(sizeof(*st->routes),st->n_clients,
- "netlink_phase_hook");
+ NEW_ARY(st->routes,st->n_clients);
/* Fill the table */
i=0;
for (c=st->clients; c; c=c->next) {
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;
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)