commit a0d9331cb13be85fb89fdf6973c50f0514a66bb3
author Daniel Willmann <daniel@totalueberwachung.de> Thu Sep 15 12:56:58 2011 +0200
committer Pablo Neira Ayuso <pablo@netfilter.org> Mon Sep 19 03:00:43 2011 +0200
tree d75cf5dc85fda9bc921405c71b586d48e20176d3
parent dc4479f27d14f1ed5e17ccac401f8169813843d7

ipa: Add a callback to detect if the server_conn was closed

src/input/ipa.c

diff --git a/src/input/ipa.c b/src/input/ipa.c
index c881b22..a887959 100644
--- a/src/input/ipa.c
+++ b/src/input/ipa.c
@@ -443,7 +443,7 @@
 struct ipa_server_conn *
 ipa_server_conn_create(void *ctx, struct ipa_server_link *link, int fd,
 		int (*cb)(struct ipa_server_conn *conn, struct msgb *msg),
-		void *data)
+		int (*closed_cb)(struct ipa_server_conn *conn), void *data)
 {
 	struct ipa_server_conn *conn;
 
@@ -459,6 +459,7 @@
 	conn->ofd.cb = ipa_server_conn_cb;
 	conn->ofd.when = BSC_FD_READ;
 	conn->cb = cb;
+	conn->closed_cb = closed_cb;
 	conn->data = data;
 	INIT_LLIST_HEAD(&conn->tx_queue);
 
@@ -474,6 +475,8 @@
 {
 	close(conn->ofd.fd);
 	osmo_fd_unregister(&conn->ofd);
+	if (conn->closed_cb)
+		conn->closed_cb(conn);
 	talloc_free(conn);
 }
 

src/ipa_proxy.c

diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c
index f4e1df8..9816d02 100644
--- a/src/ipa_proxy.c
+++ b/src/ipa_proxy.c
@@ -176,7 +176,7 @@
 	conn->route = route;
 
 	conn->src = ipa_server_conn_create(tall_ipa_proxy_ctx, link, fd,
-					   ipa_sock_src_cb, conn);
+					   ipa_sock_src_cb, NULL, conn);
 	if (conn->src == NULL) {
 		LOGP(DLINP, LOGL_ERROR, "could not create server peer: %s\n",
 			strerror(errno));