Provide a helper function for calling client->deliver, and use it at
the two call sites. We are going to fix a bug in this area and want
to bring the implementations together so we have only one place to
fix.
A side effect is that packets via point-to-point links are properly
counted.
I have verified that I caught all of the call sites by experimentally
changing the field name from "deliver" to "deliverx" in netlink.h, and
inspecting the locations of the resulting compiler errors.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Updates to release checklist in Makefile.in.
* Fix formatting error in secnet.8 manpage.
* Updates to release checklist in Makefile.in.
* Fix formatting error in secnet.8 manpage.
+ * Internal code rearrangements and improvements.
+/* Deliver a packet _to_ client; used after we have decided
+ * what to do with it. */
+static void netlink_client_deliver(struct netlink *st,
+ struct netlink_client *client,
+ uint32_t source, uint32_t dest,
+ struct buffer_if *buf)
+{
+ client->deliver(client->dst, buf);
+ client->outcount++;
+}
+
/* Deliver a packet. "client" is the _origin_ of the packet, not its
destination, and is NULL for packets from the host and packets
generated internally in secnet. */
/* Deliver a packet. "client" is the _origin_ of the packet, not its
destination, and is NULL for packets from the host and packets
generated internally in secnet. */
} else {
if (best_quality>0) {
/* XXX Fragment if required */
} else {
if (best_quality>0) {
/* XXX Fragment if required */
- st->routes[best_match]->deliver(
- st->routes[best_match]->dst, buf);
- st->routes[best_match]->outcount++;
+ netlink_client_deliver(st,st->routes[best_match],
+ source,dest,buf);
BUF_ASSERT_FREE(buf);
} else {
/* Generate ICMP destination unreachable */
BUF_ASSERT_FREE(buf);
} else {
/* Generate ICMP destination unreachable */
if (client) {
st->deliver_to_host(st->dst,buf);
} else {
if (client) {
st->deliver_to_host(st->dst,buf);
} else {
- st->clients->deliver(st->clients->dst,buf);
+ netlink_client_deliver(st,st->clients,source,dest,buf);
}
BUF_ASSERT_FREE(buf);
return;
}
BUF_ASSERT_FREE(buf);
return;