We need to ensure that manual route deletions are deleted from our internal routing table also. Partial fix for #159.

1 files changed, 28 insertions, 0 deletions

diff --git a/configure.c b/configure.c
index 3b4b2124..96d8d886 100644
--- a/configure.c
+++ b/configure.c
@@ -62,6 +62,7 @@
 
 static struct rt *routes;
 
+
 static int
 exec_script(char *const *argv, char *const *env)
 {
@@ -388,6 +389,33 @@ desc_route(const char *cmd, const struct rt *rt, const char *ifname)
 		       addr, inet_ntocidr(rt->net), inet_ntoa(rt->gate));
 }
 
+/* If something other than dhcpcd removes a route,
+ * we need to remove it from our internal table. */
+int
+route_deleted(const struct in_addr *dst,
+	      const struct in_addr *net,
+	      const struct in_addr *gate)
+{
+	struct rt rt, *f, *l;
+
+	rt.dest.s_addr = dst->s_addr;
+	rt.net.s_addr = net->s_addr;
+	rt.gate.s_addr = gate->s_addr;
+	rt.iface = NULL;
+	rt.next = NULL;
+
+	f = find_route(routes, &rt, &l, NULL);
+	if (f == NULL)
+		return 0;
+	desc_route("removing", f, f->iface->name);
+	if (l)
+		l->next = f->next;
+	else
+		routes = f->next;
+	free(f);
+	return 1;
+}
+
 static int
 n_route(struct rt *rt, const struct interface *iface)
 {