Add SDP_WAIT_ON_CLOSE flag for sdp_connect()

2 files changed, 7 insertions, 2 deletions

diff --git a/include/sdp.h b/include/sdp.h
index 7f8ff538..640cac27 100644
--- a/include/sdp.h
+++ b/include/sdp.h
@@ -376,6 +376,7 @@ extern "C" {
  * Values of the flags parameter to sdp_connect
  */
 #define SDP_RETRY_IF_BUSY	0x01
+#define SDP_WAIT_ON_CLOSE	0x02
 
 /*
  * SDP Error codes
diff --git a/src/sdp.c b/src/sdp.c
index 1e474db4..93a518cb 100644
--- a/src/sdp.c
+++ b/src/sdp.c
@@ -3167,13 +3167,17 @@ sdp_session_t *sdp_connect(const bdaddr_t *src, const bdaddr_t *dst, uint32_t fl
 			sa.l2_psm = 0;
 			if (bacmp(src, BDADDR_ANY) != 0) {
 				sa.l2_bdaddr = *src;
-				if (0 > bind(session->sock, (struct sockaddr *)&sa, sizeof(sa)))
+				if (bind(session->sock, (struct sockaddr *) &sa, sizeof(sa)) < 0)
 					goto fail;
 			}
+			if (flags & SDP_WAIT_ON_CLOSE) {
+				struct linger l = { .l_onoff = 1, .l_linger = 1 };
+				setsockopt(session->sock, SOL_SOCKET, SO_LINGER, &l, sizeof(l));
+			}
 			sa.l2_psm = htobs(SDP_PSM);
 			sa.l2_bdaddr = *dst;
 			do
-				if (connect(session->sock, (struct sockaddr *)&sa, sizeof(sa)) == 0)
+				if (connect(session->sock, (struct sockaddr *) &sa, sizeof(sa)) == 0)
 					return session;
 			while (errno == EBUSY && (flags & SDP_RETRY_IF_BUSY));
 		}