korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-01 16:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sdp_connect() async aware

Browse Source
This commit is contained in:
Marcel Holtmann 2006-08-29 22:03:13 +00:00
parent 453a0cedb6
commit a76dc65489
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/sdp.c
View File

@ -3059,8 +3059,10 @@ struct sdp_transaction {
sdp_session_t *sdp_create(int sk, uint32_t flags)
{
sdp_session_t *session;
struct sdp_transaction *t;
sdp_session_t *session = malloc(sizeof(sdp_session_t));
session = malloc(sizeof(sdp_session_t));
if (!session) {
errno = ENOMEM;
return NULL;
@ -3605,12 +3607,30 @@ static inline int sdp_is_local(const bdaddr_t *device)
sdp_session_t *sdp_connect(const bdaddr_t *src, const bdaddr_t *dst, uint32_t flags)
{
sdp_session_t *session;
struct sdp_transaction *t;
int err;
sdp_session_t *session = malloc(sizeof(sdp_session_t));
session = malloc(sizeof(sdp_session_t));
if (!session)
return session;
memset(session, 0, sizeof(*session));
session->flags = flags;
session->sock = -1;
t = malloc(sizeof(struct sdp_transaction));
if (!t) {
errno = ENOMEM;
free(session);
return NULL;
}
memset(t, 0, sizeof(*t));
session->priv = t;
if (sdp_is_local(dst)) {
struct sockaddr_un sa;
@ -3649,10 +3669,13 @@ sdp_session_t *sdp_connect(const bdaddr_t *src, const bdaddr_t *dst, uint32_t fl
while (errno == EBUSY && (flags & SDP_RETRY_IF_BUSY));
}
}
fail:
err = errno;
if (session->sock >= 0)
close(session->sock);
if (session->priv)
free(session->priv);
free(session);
errno = err;
return 0;